Fix baremetal config options in Tempest plugin
Below patch remove the baremetal tests and its configuration from Tempest tree - Id518a6d87d0949737cd1c50cb6a83149b85e5f85 Which remove the baremetal config options 'driver_enabled' also from Tempest config but this options is used by other Tempest plugin like- - openstack/vmware-nsx - openstack/networking-fo- rtinet http://codesearch.openstack.org/?q=CONF.baremetal&i=nope&files=&repos= Patch Iad6e16c28cf2a35cc6bf040f57224d32c085b7bc moved all baremetal config option to Ironic Tempest plugin but did not move the 'driver_enabled' config options. So it break the compatibility bits of config options. Patch I1ba580bd1f4beb1c5825b29995f10828f1eb1c44 add 'driver_enabled' in Ironic plugin with deprecated for removal so that tempest plugin does not get break. But instead of using 'driver_enabled' we should use new config options introduced by Id518a6d87d0949737cd1c50cb6a83149b85e5f85 Change-Id: I04d9af40dbe884df7d562269ea0f98a6fe61544c Depends-On: Id518a6d87d0949737cd1c50cb6a83149b85e5f85
This commit is contained in:
parent
af1688ff24
commit
ec41e9b0f3
@ -18,7 +18,6 @@ import re
|
||||
import time
|
||||
|
||||
from oslo_log import log as logging
|
||||
import testtools
|
||||
|
||||
from tempest import config
|
||||
from tempest.lib.common.utils import data_utils
|
||||
@ -378,8 +377,6 @@ class TestDvrBasicOps(manager.NetworkScenarioTest):
|
||||
"floating ip")
|
||||
|
||||
@test.idempotent_id('d99b62ec-28ce-44db-a195-edb74037a354')
|
||||
@testtools.skipIf(CONF.baremetal.driver_enabled,
|
||||
'Baremetal relies on a shared physical network.')
|
||||
@test.services('compute', 'network')
|
||||
def test_dvr_connectivity_between_vms_on_different_networks(self):
|
||||
"""
|
||||
@ -427,9 +424,6 @@ class TestDvrBasicOps(manager.NetworkScenarioTest):
|
||||
should_connect=True)
|
||||
|
||||
@test.idempotent_id('a73fd605-d55e-4151-b25e-41e7a7ff2258')
|
||||
@testtools.skipIf(CONF.baremetal.driver_enabled,
|
||||
'Router state cannot be altered on a shared baremetal '
|
||||
'network')
|
||||
@test.services('compute', 'network')
|
||||
def test_dvr_update_router_admin_state(self):
|
||||
"""
|
||||
|
Loading…
Reference in New Issue
Block a user