From: Aaron Rosen <aaronorosen@gmail.com>
Date: Mon, 8 Sep 2014 18:00:44 +0000 (-0700)
Subject: Neutron should not use the neutronclient utils module for import_class
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=dbc9c0c799bcbfa378cee3ea1e428d4a41547db7;p=openstack-build%2Fneutron-build.git

Neutron should not use the neutronclient utils module for import_class

Fixes code to use openstack.common.importutils instead.

Change-Id: Ia449f8b1d7d03f37483cfdc595ad77e71ea6598c
Closes-bug: 1366917
---

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