From 7d7ac483cf323c00c522fa465fd1df0f05fb3317 Mon Sep 17 00:00:00 2001 From: Edgar Magana Date: Thu, 25 Aug 2011 12:50:02 -0700 Subject: [PATCH] Sorting correctly all imports for the Nexus Driver and Unit Test --- quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py | 2 +- quantum/plugins/cisco/nexus/cisco_nexus_plugin.py | 2 +- quantum/plugins/cisco/tests/unit/test_nexus_plugin.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py b/quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py index 717be135f..06b6ad30e 100644 --- a/quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py +++ b/quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py @@ -24,8 +24,8 @@ Implements a Nexus-OS NETCONF over SSHv2 API Client import logging as LOG from quantum.plugins.cisco.common import cisco_constants as const -from quantum.plugins.cisco.nexus import cisco_nexus_snippets as snipp from quantum.plugins.cisco.db import l2network_db as cdb +from quantum.plugins.cisco.nexus import cisco_nexus_snippets as snipp from ncclient import manager diff --git a/quantum/plugins/cisco/nexus/cisco_nexus_plugin.py b/quantum/plugins/cisco/nexus/cisco_nexus_plugin.py index 62f3806f3..dd93cf10e 100644 --- a/quantum/plugins/cisco/nexus/cisco_nexus_plugin.py +++ b/quantum/plugins/cisco/nexus/cisco_nexus_plugin.py @@ -26,9 +26,9 @@ from quantum.common import exceptions as exc from quantum.common import utils from quantum.plugins.cisco.common import cisco_constants as const from quantum.plugins.cisco.common import cisco_credentials as cred +from quantum.plugins.cisco.db import nexus_db as nxos_db from quantum.plugins.cisco.l2device_plugin_base import L2DevicePluginBase from quantum.plugins.cisco.nexus import cisco_nexus_configuration as conf -from quantum.plugins.cisco.db import nexus_db as nxos_db LOG.basicConfig(level=LOG.WARN) LOG.getLogger(const.LOGGER_COMPONENT_NAME) diff --git a/quantum/plugins/cisco/tests/unit/test_nexus_plugin.py b/quantum/plugins/cisco/tests/unit/test_nexus_plugin.py index bfb7b851b..f95352eef 100644 --- a/quantum/plugins/cisco/tests/unit/test_nexus_plugin.py +++ b/quantum/plugins/cisco/tests/unit/test_nexus_plugin.py @@ -14,13 +14,13 @@ # # @author: Shweta Padubidri, Peter Strunk, Cisco Systems, Inc. # -import unittest import logging +import unittest from quantum.common import exceptions as exc from quantum.plugins.cisco.common import cisco_constants as const -from quantum.plugins.cisco.nexus import cisco_nexus_plugin from quantum.plugins.cisco.db import l2network_db as cdb from quantum.plugins.cisco.db import api as db +from quantum.plugins.cisco.nexus import cisco_nexus_plugin LOG = logging.getLogger('quantum.tests.test_nexus') -- 2.45.2