cf37563c83
This was deprecated in https://review.openstack.org/#/c/503070/ so remove all the vsctl-related code, leaving just the native ovsdb api. Also removed renamed ovs_vsctl_timeout value, which was changed to ovsdb_timeout in https://review.openstack.org/#/c/518391/ Change-Id: I50dfcea3deb41df1bd01fd06b76522453a6ba50b
40 lines
1.5 KiB
Python
40 lines
1.5 KiB
Python
# Copyright (c) 2012 OpenStack Foundation.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import mock
|
|
|
|
from neutron.cmd import ovs_cleanup as util
|
|
from neutron.tests import base
|
|
|
|
|
|
class TestOVSCleanup(base.BaseTestCase):
|
|
|
|
def test_clean_ovs_bridges(self):
|
|
conf = mock.Mock()
|
|
conf.ovs_all_ports = True
|
|
conf.ovs_integration_bridge = 'br-int'
|
|
conf.external_network_bridge = 'br-ex'
|
|
bridges = [conf.ovs_integration_bridge, conf.external_network_bridge]
|
|
with mock.patch('neutron.agent.common.ovs_lib.BaseOVS') as ovs_cls:
|
|
ovs_base = mock.Mock()
|
|
ovs_base.get_bridges.return_value = bridges
|
|
ovs_cls.return_value = ovs_base
|
|
|
|
util.do_main(conf)
|
|
ovs_base.ovsdb.ovs_cleanup.assert_has_calls(
|
|
[mock.call(conf.ovs_integration_bridge, True),
|
|
mock.call(conf.external_network_bridge, True)],
|
|
any_order=True)
|