Skip to content
Permalink
Browse files

Ignore test that fails due to #2983

-also some minor stability tweaks around other tests
  • Loading branch information
rtretyak committed Nov 29, 2019
1 parent 7cbde9a commit 72d927f43fe787fb5feffdf7732b5db7bbec55e0
@@ -57,7 +57,7 @@ class ConfigurationSpec extends HealthCheckSpecification {
northbound.getKildaConfiguration().flowEncapsulationType == newFlowEncapsulationType.toString().toLowerCase()

when: "Create a flow without encapsulation type"
def flow2 = flowHelperV2.randomFlow(switchPair)
def flow2 = flowHelperV2.randomFlow(switchPair, false, [flow1])
flow2.encapsulationType = null
northboundV2.addFlow(flow2)

@@ -92,7 +92,7 @@ class BandwidthSpec extends HealthCheckSpecification {
flow1Path == switchPair.paths.first()

when: "Create another flow. One path is shorter but available bandwidth is not enough, another path is longer"
def flow2 = flowHelper.randomFlow(switchPair)
def flow2 = flowHelper.randomFlow(switchPair, false, [flow1])
flow2.maximumBandwidth = 101
flowHelper.addFlow(flow2)

@@ -90,7 +90,7 @@ class BandwidthV2Spec extends HealthCheckSpecification {
flow1Path == switchPair.paths.first()

when: "Create another flow. One path is shorter but available bandwidth is not enough, another path is longer"
def flow2 = flowHelperV2.randomFlow(switchPair)
def flow2 = flowHelperV2.randomFlow(switchPair, false, [flow1])
flow2.maximumBandwidth = 101
flowHelperV2.addFlow(flow2)

@@ -52,7 +52,7 @@ class LinkMaintenanceSpec extends HealthCheckSpecification {
flowHelper.addFlow(flow1)
def flow1Path = PathHelper.convert(northbound.getFlowPath(flow1.id))

def flow2 = flowHelper.randomFlow(switchPair)
def flow2 = flowHelper.randomFlow(switchPair, false, [flow1])
flowHelper.addFlow(flow2)
def flow2Path = PathHelper.convert(northbound.getFlowPath(flow2.id))

@@ -100,7 +100,7 @@ class LinkMaintenanceSpec extends HealthCheckSpecification {
flowHelper.addFlow(flow1)
def flow1Path = PathHelper.convert(northbound.getFlowPath(flow1.id))

def flow2 = flowHelper.randomFlow(switchPair)
def flow2 = flowHelper.randomFlow(switchPair, false, [flow1])
flowHelper.addFlow(flow2)
def flow2Path = PathHelper.convert(northbound.getFlowPath(flow2.id))

@@ -8,6 +8,7 @@ import static org.openkilda.testing.Constants.PATH_INSTALLATION_TIME
import static org.openkilda.testing.Constants.WAIT_OFFSET

import org.openkilda.functionaltests.HealthCheckSpecification
import org.openkilda.functionaltests.extension.failfast.Tidy
import org.openkilda.functionaltests.extension.tags.Tags
import org.openkilda.functionaltests.helpers.PathHelper
import org.openkilda.functionaltests.helpers.Wrappers
@@ -115,16 +116,18 @@ class LinkSpec extends HealthCheckSpecification {
flow1 = flowHelper.addFlow(flow1)
and: "Reverse flow from destination switch to source switch"
def flow2 = flowHelper.randomFlow(switchPair).tap { it.pinned = true }
def flow2 = flowHelper.randomFlow(switchPair, false, [flow1]).tap { it.pinned = true }
flow2 = flowHelper.addFlow(flow2)
and: "Forward flow from source switch to some 'internal' switch"
def islToInternal = pathHelper.getInvolvedIsls(PathHelper.convert(northbound.getFlowPath(flow1.id))).first()
def flow3 = flowHelper.randomFlow(islToInternal.srcSwitch, islToInternal.dstSwitch).tap { it.pinned = true }
def flow3 = flowHelper.randomFlow(islToInternal.srcSwitch, islToInternal.dstSwitch, false, [flow1, flow2])
.tap { it.pinned = true }
flow3 = flowHelper.addFlow(flow3)
and: "Reverse flow from 'internal' switch to source switch"
def flow4 = flowHelper.randomFlow(islToInternal.dstSwitch, islToInternal.srcSwitch).tap { it.pinned = true }
def flow4 = flowHelper.randomFlow(islToInternal.dstSwitch, islToInternal.srcSwitch, false,
[flow1, flow2, flow3]).tap { it.pinned = true }
flow4 = flowHelper.addFlow(flow4)
when: "Get all flows going through the link from source switch to 'internal' switch"
@@ -185,7 +188,7 @@ class LinkSpec extends HealthCheckSpecification {
}
and: "Delete all created flows and reset costs"
[flow1, flow2, flow3, flow4].each { flowHelper.deleteFlow(it.id) }
[flow1, flow2, flow3, flow4].each { flowHelperV2.deleteFlow(it.id) }
database.resetCosts()
}
@@ -264,6 +267,7 @@ class LinkSpec extends HealthCheckSpecification {
getIsl().srcSwitch.dpId | -3 | getIsl().dstSwitch.dpId | -4 | "src_port & dst_port"
}
@Tidy
@Unroll
def "Unable to get flows without full specifying a particular link (#item is missing)"() {
when: "Get flows without specifying #item"
@@ -356,7 +360,7 @@ class LinkSpec extends HealthCheckSpecification {
flowHelper.addFlow(flow1)
def flow1Path = PathHelper.convert(northbound.getFlowPath(flow1.id))
def flow2 = flowHelper.randomFlow(switchPair)
def flow2 = flowHelper.randomFlow(switchPair, false, [flow1])
flowHelper.addFlow(flow2)
def flow2Path = PathHelper.convert(northbound.getFlowPath(flow2.id))
@@ -53,6 +53,7 @@ class ContentionV2Spec extends BaseSpecification {
flowHelperV2.deleteFlow(flow.flowId)
}

@Ignore("https://github.com/telstra/open-kilda/issues/2983")
def "Parallel flow crud requests properly allocate/deallocate bandwidth resources"() {
when: "Create multiple flows on the same ISLs concurrently"
def flowsAmount = 20
@@ -81,7 +82,7 @@ class ContentionV2Spec extends BaseSpecification {
def deleteTasks = flows.collect { flow ->
group.task { flowHelperV2.deleteFlow(flow.flowId) }
}
deleteTasks*.join()
deleteTasks*.get()

then: "Available bandwidth on all related isls is reverted back to normal"
Wrappers.wait(3) {
@@ -74,7 +74,7 @@ class SwitchMaintenanceSpec extends HealthCheckSpecification {
flowHelper.addFlow(flow1)
def flow1Path = PathHelper.convert(northbound.getFlowPath(flow1.id))
def flow2 = flowHelper.randomFlow(switchPair)
def flow2 = flowHelper.randomFlow(switchPair, false, [flow1])
flowHelper.addFlow(flow2)
def flow2Path = PathHelper.convert(northbound.getFlowPath(flow2.id))

0 comments on commit 72d927f

Please sign in to comment.
You can’t perform that action at this time.