22328baf1f
It's mostly a matter of changing imports to a new location. Non-obvious changes needed: * pass overwrite= argument to oslo_context since oslo.log reads context from its thread local store and not local.store from incubator * don't store context at local.store now that there is no code that would consume it * LOG.deprecated() -> versionutils.report_deprecated_feature() * dropped LOG.audit check from hacking rule since now the method does not exist * WritableLogger is now located in oslo_log.loggers Dropped log module from the tree. Also dropped local module that is now of no use (and obsolete, as per oslo team). Added versionutils back to openstack-common.conf since now we use the module directly from neutron code and not just as a dependency of some other oslo-incubator module. Note: tempest tests are expected to be broken now, so instead of fixing all the oslo.log related issues for the subtree in this patch, I only added TODOs with directions for later fix. Closes-Bug: #1425013 Change-Id: I310e059a815377579de6bb2aa204de168e72571e
157 lines
5.1 KiB
Python
157 lines
5.1 KiB
Python
# Copyright 2012, Nachi Ueno, NTT MCL, Inc.
|
|
# 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 cliff import lister
|
|
from neutronclient.common import utils
|
|
from neutronclient.neutron import v2_0 as client
|
|
from neutronclient.neutron.v2_0 import port
|
|
from oslo_log import log as logging
|
|
|
|
from neutron.i18n import _LI
|
|
|
|
|
|
class ProbeCommand(client.NeutronCommand):
|
|
log = logging.getLogger(__name__ + '.ProbeCommand')
|
|
|
|
def get_debug_agent(self):
|
|
return self.app.debug_agent
|
|
|
|
def run(self, parsed_args):
|
|
self.log.debug('run(%s)', parsed_args)
|
|
self.log.info(_('Unimplemented commands'))
|
|
|
|
|
|
class CreateProbe(ProbeCommand):
|
|
"""Create probe port and interface, then plug it in."""
|
|
|
|
log = logging.getLogger(__name__ + '.CreateProbe')
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(CreateProbe, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'id', metavar='network_id',
|
|
help=_('ID of network to probe'))
|
|
parser.add_argument(
|
|
'--device-owner',
|
|
default='network', choices=['network', 'compute'],
|
|
help=_('Owner type of the device: network/compute'))
|
|
return parser
|
|
|
|
def run(self, parsed_args):
|
|
self.log.debug('run(%s)', parsed_args)
|
|
debug_agent = self.get_debug_agent()
|
|
probe_port = debug_agent.create_probe(parsed_args.id,
|
|
parsed_args.device_owner)
|
|
self.log.info(_('Probe created : %s '), probe_port.id)
|
|
|
|
|
|
class DeleteProbe(ProbeCommand):
|
|
"""Delete probe - delete port then uplug."""
|
|
|
|
log = logging.getLogger(__name__ + '.DeleteProbe')
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(DeleteProbe, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'id', metavar='port_id',
|
|
help=_('ID of probe port to delete'))
|
|
return parser
|
|
|
|
def run(self, parsed_args):
|
|
self.log.debug('run(%s)', parsed_args)
|
|
debug_agent = self.get_debug_agent()
|
|
debug_agent.delete_probe(parsed_args.id)
|
|
self.log.info(_('Probe %s deleted'), parsed_args.id)
|
|
|
|
|
|
class ListProbe(client.NeutronCommand, lister.Lister):
|
|
"""List probes."""
|
|
|
|
log = logging.getLogger(__name__ + '.ListProbe')
|
|
_formatters = {'fixed_ips': port._format_fixed_ips, }
|
|
|
|
def get_debug_agent(self):
|
|
return self.app.debug_agent
|
|
|
|
def get_data(self, parsed_args):
|
|
|
|
debug_agent = self.get_debug_agent()
|
|
info = debug_agent.list_probes()
|
|
columns = sorted(info[0].keys()) if info else []
|
|
return (columns, (utils.get_item_properties(
|
|
s, columns, formatters=self._formatters, )
|
|
for s in info), )
|
|
|
|
|
|
class ClearProbe(ProbeCommand):
|
|
"""Clear All probes."""
|
|
|
|
log = logging.getLogger(__name__ + '.ClearProbe')
|
|
|
|
def run(self, parsed_args):
|
|
self.log.debug('run(%s)', parsed_args)
|
|
debug_agent = self.get_debug_agent()
|
|
cleared_probes_count = debug_agent.clear_probes()
|
|
self.log.info(_LI('%d probe(s) deleted'), cleared_probes_count)
|
|
|
|
|
|
class ExecProbe(ProbeCommand):
|
|
"""Exec commands on the namespace of the probe."""
|
|
|
|
log = logging.getLogger(__name__ + '.ExecProbe')
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(ExecProbe, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'id', metavar='port_id',
|
|
help=_('ID of probe port to execute command'))
|
|
parser.add_argument(
|
|
'command', metavar='command',
|
|
nargs='?',
|
|
default=None,
|
|
help=_('Command to execute'))
|
|
return parser
|
|
|
|
def run(self, parsed_args):
|
|
self.log.debug('run(%s)', parsed_args)
|
|
debug_agent = self.get_debug_agent()
|
|
result = debug_agent.exec_command(parsed_args.id, parsed_args.command)
|
|
self.app.stdout.write(result + '\n')
|
|
|
|
|
|
class PingAll(ProbeCommand):
|
|
"""Ping all fixed_ip."""
|
|
|
|
log = logging.getLogger(__name__ + '.ExecProbe')
|
|
|
|
def get_parser(self, prog_name):
|
|
parser = super(PingAll, self).get_parser(prog_name)
|
|
parser.add_argument(
|
|
'--timeout', metavar='<timeout>',
|
|
default=10,
|
|
help=_('Ping timeout'))
|
|
parser.add_argument(
|
|
'--id', metavar='network_id',
|
|
default=None,
|
|
help=_('ID of network'))
|
|
return parser
|
|
|
|
def run(self, parsed_args):
|
|
self.log.debug('run(%s)', parsed_args)
|
|
debug_agent = self.get_debug_agent()
|
|
result = debug_agent.ping_all(parsed_args.id,
|
|
timeout=parsed_args.timeout)
|
|
self.app.stdout.write(result + '\n')
|