summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhongyue Luo <zhongyue.nah@intel.com>2013-01-03 18:21:36 +0800
committerZhongyue Luo <zhongyue.nah@intel.com>2013-01-03 18:30:50 +0800
commit17642b2e1ae6ba6284ee01b9b99edd7ad447fb90 (patch)
tree94839abba1a2c6b8d6a3187322f84836e8ff3e9b
parent7240f7d480a14e1dfde83400af2bb385b4e3b9e9 (diff)
Removes unused imports
Change-Id: I76d243329f810cdcd6f8a5459eb66fddd5871e33
-rw-r--r--nova/tests/baremetal/test_driver.py9
-rw-r--r--nova/tests/baremetal/test_ipmi.py4
-rw-r--r--nova/tests/consoleauth/test_rpcapi.py1
-rw-r--r--nova/tests/virt/disk/test_api.py3
-rw-r--r--nova/virt/baremetal/db/sqlalchemy/models.py2
-rw-r--r--nova/virt/baremetal/fake.py1
-rw-r--r--nova/virt/baremetal/ipmi.py1
7 files changed, 3 insertions, 18 deletions
diff --git a/nova/tests/baremetal/test_driver.py b/nova/tests/baremetal/test_driver.py
index 4c4e01719..d90c6ac50 100644
--- a/nova/tests/baremetal/test_driver.py
+++ b/nova/tests/baremetal/test_driver.py
@@ -22,23 +22,18 @@
Tests for the base baremetal driver class.
"""
-import mox
-
-from nova.openstack.common import cfg
-
from nova import exception
+from nova.openstack.common import cfg
from nova import test
-
from nova.tests.baremetal.db import base as bm_db_base
from nova.tests.baremetal.db import utils as bm_db_utils
from nova.tests.image import fake as fake_image
from nova.tests import utils
-
from nova.virt.baremetal import baremetal_states
from nova.virt.baremetal import db
from nova.virt.baremetal import driver as bm_driver
from nova.virt.baremetal import fake
-from nova.virt import firewall
+
CONF = cfg.CONF
diff --git a/nova/tests/baremetal/test_ipmi.py b/nova/tests/baremetal/test_ipmi.py
index 40ec43abd..def6da66f 100644
--- a/nova/tests/baremetal/test_ipmi.py
+++ b/nova/tests/baremetal/test_ipmi.py
@@ -24,9 +24,6 @@ Test class for baremetal IPMI power manager.
import os
import stat
import tempfile
-import time
-
-import mox
from nova.openstack.common import cfg
from nova import test
@@ -35,7 +32,6 @@ from nova import utils
from nova.virt.baremetal import baremetal_states
from nova.virt.baremetal import ipmi
from nova.virt.baremetal import utils as bm_utils
-from nova.virt.libvirt import utils as libvirt_utils
CONF = cfg.CONF
diff --git a/nova/tests/consoleauth/test_rpcapi.py b/nova/tests/consoleauth/test_rpcapi.py
index c15ff7ff4..264c4e10b 100644
--- a/nova/tests/consoleauth/test_rpcapi.py
+++ b/nova/tests/consoleauth/test_rpcapi.py
@@ -18,7 +18,6 @@
Unit Tests for nova.consoleauth.rpcapi
"""
-from nova.consoleauth import manager as consoleauth_manager
from nova.consoleauth import rpcapi as consoleauth_rpcapi
from nova import context
from nova.openstack.common import cfg
diff --git a/nova/tests/virt/disk/test_api.py b/nova/tests/virt/disk/test_api.py
index 95368a2c2..15fb2fc2f 100644
--- a/nova/tests/virt/disk/test_api.py
+++ b/nova/tests/virt/disk/test_api.py
@@ -15,13 +15,10 @@
# License for the specific language governing permissions and limitations
# under the License.
-
-import os
import tempfile
import fixtures
-from nova.openstack.common import importutils
from nova import test
from nova.virt.disk import api
diff --git a/nova/virt/baremetal/db/sqlalchemy/models.py b/nova/virt/baremetal/db/sqlalchemy/models.py
index 005f2d945..7f9ffb901 100644
--- a/nova/virt/baremetal/db/sqlalchemy/models.py
+++ b/nova/virt/baremetal/db/sqlalchemy/models.py
@@ -20,8 +20,8 @@ SQLAlchemy models for baremetal data.
"""
from sqlalchemy import Column, Integer, String
-from sqlalchemy import ForeignKey, Text
from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy import ForeignKey, Text
from nova.db.sqlalchemy import models
diff --git a/nova/virt/baremetal/fake.py b/nova/virt/baremetal/fake.py
index 16f599d53..7a400af6f 100644
--- a/nova/virt/baremetal/fake.py
+++ b/nova/virt/baremetal/fake.py
@@ -16,7 +16,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-from nova.virt.baremetal import baremetal_states
from nova.virt.baremetal import base
from nova.virt.firewall import NoopFirewallDriver
diff --git a/nova/virt/baremetal/ipmi.py b/nova/virt/baremetal/ipmi.py
index cc1704c7c..58899ebef 100644
--- a/nova/virt/baremetal/ipmi.py
+++ b/nova/virt/baremetal/ipmi.py
@@ -24,7 +24,6 @@ Baremetal IPMI power manager.
import os
import stat
import tempfile
-import time
from nova.exception import InvalidParameterValue
from nova.openstack.common import cfg