Change binding config from 'driver' to 'default_driver'
This config was renamed in kuryr-lib 0.7.0 Depends-On: I92ba7878437c05be6ecda9a03608fd7803e100ac Change-Id: Id3c58e635e3c1a679050ab803b4bcadc2ae036a0
This commit is contained in:
parent
2b185b92ce
commit
c2e95fd203
|
@ -203,7 +203,7 @@ def _verify_port_driver_compliancy(driver, port_driver_name):
|
|||
|
||||
|
||||
def _verify_binding_driver_compatibility(driver, port_driver_name):
|
||||
tokens = config.CONF.binding.driver.rsplit('.', 1)
|
||||
tokens = config.CONF.binding.default_driver.rsplit('.', 1)
|
||||
binding_driver_name = tokens[0] if len(tokens) == 1 else tokens[1]
|
||||
binding_driver_name.lower()
|
||||
|
||||
|
|
|
@ -60,7 +60,7 @@ class TestDriver(base.TestKuryrBase):
|
|||
|
||||
@mock.patch('kuryr_libnetwork.config.CONF')
|
||||
def test__verify_binding_driver_compatibility(self, mock_conf):
|
||||
mock_conf.binding.driver = 'veth'
|
||||
mock_conf.binding.default_driver = 'veth'
|
||||
fake_driver = mock.Mock(spec=driver.Driver)
|
||||
fake_driver.get_supported_bindings.return_value = ('veth',)
|
||||
|
||||
|
@ -93,7 +93,7 @@ class TestNestedDriverFailures(base.TestKuryrFailures):
|
|||
|
||||
@mock.patch('kuryr_libnetwork.config.CONF')
|
||||
def test__verify_binding_driver_compatibility_not_compatible(self, m_conf):
|
||||
m_conf.binding.driver = 'macvlan'
|
||||
m_conf.binding.default_driver = 'macvlan'
|
||||
message = "Configuration file error: port driver 'veth' is not " \
|
||||
"compatible with binding driver 'macvlan'"
|
||||
|
||||
|
@ -104,7 +104,7 @@ class TestNestedDriverFailures(base.TestKuryrFailures):
|
|||
|
||||
@mock.patch('kuryr_libnetwork.config.CONF')
|
||||
def test__verify_binding_driver_compatibility_not_supported(self, m_conf):
|
||||
m_conf.binding.driver = 'ipvlan'
|
||||
m_conf.binding.default_driver = 'ipvlan'
|
||||
message = "Configuration file error: binding driver 'ipvlan' is " \
|
||||
"currently not supported with 'nested' port driver"
|
||||
|
||||
|
|
Loading…
Reference in New Issue