Revert "Skip test_qos_min_bw_allocation_basic when not supported"

This reverts commit 0976ae4ee2. That
commit introduced a skip of MinBwAllocationPlacementTest tests if no
bandwidth allocation is possible to avoid failing these tests in OVN
jobs. However that is a wrong solutions as it would skip the test also
in OVS jobs if we regress the bandwidth inventory reporting in neutron
(or regress allocation candidate handling in placement).

A better fix is not to enable the tempest test flag on OVN jobs:
   $TEMPEST_CONFIG:
       network-feature-enabled:
           qos_placement_physnet

The existing tests already skipped if this is not configured.

This also means that the generic tempest-* job definitions should not
configure the above flag as those tempest jobs will run by default with
OVN. So they are cleaned up along with the OVS specific neutron configuration.

This means that jobs that was inherit from tempest-multinode-full-py3
and tempest-full-py3 and reconfigre the job to run with OVS instead of
the default OVN needs to change to configure the OVS specific network
config and enable the qos tests. This will be done in project specific
patches.

The stable tempest jobs are OK as they are still running with OVS by
default.

Depends-On: https://review.opendev.org/c/openstack/neutron/+/806170

Change-Id: I13fd2dc023b806ac74ab5c8d86cc99f807f0f702
This commit is contained in:
Balazs Gibizer 2021-08-26 13:38:19 +02:00
parent ea503b6f87
commit a5f523b20a
2 changed files with 2 additions and 35 deletions

View File

@ -146,11 +146,8 @@ class MinBwAllocationPlacementTest(manager.NetworkScenarioTest):
resources1='%s:%s' % (self.INGRESS_RESOURCE_CLASS,
self.SMALLEST_POSSIBLE_BW))
if len(alloc_candidates['provider_summaries']) == 0:
# Skip if the backend does not support QoS minimum bandwidth
# allocation in Placement API
raise self.skipException(
'No allocation candidates are available for %s:%s' %
(self.INGRESS_RESOURCE_CLASS, self.SMALLEST_POSSIBLE_BW))
self.fail('No allocation candidates are available for %s:%s' %
(self.INGRESS_RESOURCE_CLASS, self.SMALLEST_POSSIBLE_BW))
# Just to be sure check with impossible high (placement max_int),
# allocation

View File

@ -82,21 +82,9 @@
GLANCE_USE_IMPORT_WORKFLOW: True
devstack_plugins:
neutron: https://opendev.org/openstack/neutron
devstack_local_conf:
post-config:
"/$NEUTRON_CORE_PLUGIN_CONF":
ovs:
bridge_mappings: public:br-ex
resource_provider_bandwidths: br-ex:1000000:1000000
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
qos_placement_physnet: public
devstack_services:
# Enbale horizon so that we can run horizon test.
horizon: true
neutron-placement: true
neutron-qos: true
- job:
name: tempest-integrated-networking
@ -229,30 +217,12 @@
USE_PYTHON3: true
devstack_plugins:
neutron: https://opendev.org/openstack/neutron
devstack_local_conf:
post-config:
"/$NEUTRON_CORE_PLUGIN_CONF":
ovs:
bridge_mappings: public:br-ex
resource_provider_bandwidths: br-ex:1000000:1000000
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
qos_placement_physnet: public
devstack_services:
neutron-placement: true
neutron-qos: true
neutron-trunk: true
group-vars:
subnode:
devstack_localrc:
USE_PYTHON3: true
devstack_local_conf:
post-config:
"/$NEUTRON_CORE_PLUGIN_CONF":
ovs:
bridge_mappings: public:br-ex
resource_provider_bandwidths: br-ex:1000000:1000000
- job:
name: tempest-slow