Merge "Neutron should not use the neutronclient utils module for import_class"

This commit is contained in:
Jenkins 2014-09-10 07:22:11 +00:00 committed by Gerrit Code Review
commit fd81307366

View File

@ -22,21 +22,20 @@ from neutron.agent.linux import interface
from neutron.debug import debug_agent from neutron.debug import debug_agent
from neutron.openstack.common import importutils from neutron.openstack.common import importutils
from neutronclient.common import exceptions as exc from neutronclient.common import exceptions as exc
from neutronclient.common import utils
from neutronclient import shell from neutronclient import shell
COMMAND_V2 = { COMMAND_V2 = {
'probe-create': utils.import_class( 'probe-create': importutils.import_class(
'neutron.debug.commands.CreateProbe'), 'neutron.debug.commands.CreateProbe'),
'probe-delete': utils.import_class( 'probe-delete': importutils.import_class(
'neutron.debug.commands.DeleteProbe'), 'neutron.debug.commands.DeleteProbe'),
'probe-list': utils.import_class( 'probe-list': importutils.import_class(
'neutron.debug.commands.ListProbe'), 'neutron.debug.commands.ListProbe'),
'probe-clear': utils.import_class( 'probe-clear': importutils.import_class(
'neutron.debug.commands.ClearProbe'), 'neutron.debug.commands.ClearProbe'),
'probe-exec': utils.import_class( 'probe-exec': importutils.import_class(
'neutron.debug.commands.ExecProbe'), 'neutron.debug.commands.ExecProbe'),
'ping-all': utils.import_class( 'ping-all': importutils.import_class(
'neutron.debug.commands.PingAll'), 'neutron.debug.commands.PingAll'),
#TODO(nati) ping, netcat , nmap, bench #TODO(nati) ping, netcat , nmap, bench
} }