86fc490cac
Implements blueprint argparse-based-cfg Sync the following changes from oslo-incubator: 479f19c Add deprecated --logdir common opt 27b2ff4 Add deprecated --logfile common opt. 9b81289 Allow nova and others to override some logging defaults 3557d84 Fix ListOpt to trim whitespace 01ab910 Fix set_default() with boolean CLI options af18eaa Improve cfg's argparse sub-parsers support f21e1d9 Fix regression with cfg CLI arguments ceb4aa7 Fix broken --help with CommonConfigOpts 5e9503b Hide the GroupAttr conf and group attributes b6d24bb updating sphinx documentation 403509e Don't reference argparse._StoreAction e17deb8 Fix minor coding style issue 0c29e1d Remove ConfigCliParser class 5b9cb41 Add support for positional arguments dbc72a6 Use stock argparse behaviour for optional args 768a147 Use stock argparse --usage behaviour ac180b9 Use stock argparse --version behaviour 0787e38 Remove add_option() method 5afead0 Completely remove cfg's disable_interspersed_args() 5f564b2 argparse support for cfg d7b6397 Add a missing comma in a docstring. aca1805 cfg: fix required if option has a dash Note: various utilities/services with command line parameters needed to be updated due to the changes mentioned above. The downside is that these are not backward compatible. Unknown arguments are no ignored. Only bound arguments will be treated. Thanks to Mark McLoughlin for migration cli code changes. Change-Id: Ia776e78cc55f4ed33ace5efa8d726b70e3fa4131
75 lines
2.4 KiB
Python
75 lines
2.4 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright (c) 2012 OpenStack LLC.
|
|
# 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.
|
|
|
|
from quantum.agent import l3_agent
|
|
from quantum.agent.linux import interface
|
|
from quantum.agent.linux import ovs_lib
|
|
from quantum.common import config
|
|
from quantum.openstack.common import cfg
|
|
from quantum.openstack.common import log as logging
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
def setup_conf():
|
|
"""Setup the cfg for the clean up utility.
|
|
|
|
Use separate setup_conf for the utility because there are many options
|
|
from the main config that do not apply during clean-up.
|
|
"""
|
|
opts = [
|
|
cfg.BoolOpt('ovs_all_ports',
|
|
default=False,
|
|
help='True to delete all ports on all the OpenvSwitch '
|
|
'bridges. False to delete ports created by Quantum '
|
|
'on integration and external network bridges.')
|
|
]
|
|
|
|
conf = cfg.CommonConfigOpts()
|
|
conf.register_cli_opts(opts)
|
|
conf.register_opts(l3_agent.L3NATAgent.OPTS)
|
|
conf.register_opts(interface.OPTS)
|
|
config.setup_logging(conf)
|
|
return conf
|
|
|
|
|
|
def main():
|
|
"""Main method for cleaning up OVS bridges.
|
|
|
|
The utility cleans up the integration bridges used by Quantum.
|
|
"""
|
|
|
|
conf = setup_conf()
|
|
conf()
|
|
|
|
configuration_bridges = set([conf.ovs_integration_bridge,
|
|
conf.external_network_bridge])
|
|
ovs_bridges = set(ovs_lib.get_bridges(conf.root_helper))
|
|
|
|
if conf.ovs_all_ports:
|
|
bridges = ovs_bridges
|
|
else:
|
|
bridges = configuration_bridges & ovs_bridges
|
|
|
|
for bridge in bridges:
|
|
LOG.info(_("Cleaning %s"), bridge)
|
|
ovs = ovs_lib.OVSBridge(bridge, conf.root_helper)
|
|
ovs.delete_ports(all_ports=conf.ovs_all_ports)
|
|
|
|
LOG.info(_("OVS cleanup completed successfully"))
|