Organizes imports

Organizes imports to be pep8 compliant.

hyperv/nova/basevolumeutils.py

@@ -28,10 +28,9 @@ if sys.platform == 'win32':
     import _winreg
     import wmi
 
-from oslo_log import log as logging
-
 from nova import block_device
 from nova.virt import driver
+from oslo_log import log as logging
 
 from hyperv.i18n import _LI
 

hyperv/nova/driver.py

@@ -19,9 +19,9 @@ A Hyper-V Nova Compute driver.
 
 import platform
 
+from nova.virt import driver
 from oslo_log import log as logging
 
-from nova.virt import driver
 from hyperv.i18n import _
 from hyperv.nova import hostops
 from hyperv.nova import livemigrationops

hyperv/nova/hostops.py

@@ -21,14 +21,15 @@ import os
 import platform
 import time
 
+
+from nova.compute import arch
+from nova.compute import hv_type
+from nova.compute import vm_mode
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import units
 
-from nova.compute import arch
-from nova.compute import hv_type
-from nova.compute import vm_mode
 from hyperv.i18n import _
 from hyperv.nova import constants
 from hyperv.nova import utilsfactory

hyperv/nova/imagecache.py

@@ -17,16 +17,17 @@ Image caching and management.
 """
 import os
 
+from nova import utils
+from nova.virt import images
+
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils
 from oslo_utils import units
 
 from hyperv.i18n import _
-from nova import utils
 from hyperv.nova import utilsfactory
 from hyperv.nova import vmutils
-from nova.virt import images
 
 LOG = logging.getLogger(__name__)
 

hyperv/nova/livemigrationops.py

@@ -18,11 +18,11 @@ Management class for live migration VM operations.
 """
 import functools
 
+from nova.virt import configdrive
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils
 
-from nova.virt import configdrive
 from hyperv.i18n import _
 from hyperv.nova import imagecache
 from hyperv.nova import utilsfactory

hyperv/nova/livemigrationutils.py

@@ -18,9 +18,8 @@ import sys
 if sys.platform == 'win32':
     import wmi
 
-from oslo_log import log as logging
-
 from nova import exception
+from oslo_log import log as logging
 
 from hyperv.i18n import _, _LE
 from hyperv.nova import vmutils

hyperv/nova/migrationops.py

@@ -18,12 +18,12 @@ Management class for migration / resize operations.
 """
 import os
 
+from nova import exception
+from nova.virt import configdrive
 from oslo_log import log as logging
 from oslo_utils import excutils
 from oslo_utils import units
 
-from nova import exception
-from nova.virt import configdrive
 from hyperv.i18n import _, _LE
 from hyperv.nova import imagecache
 from hyperv.nova import utilsfactory

hyperv/nova/pathutils.py

@@ -20,10 +20,10 @@ import sys
 if sys.platform == 'win32':
     import wmi
 
+from nova import utils
 from oslo_config import cfg
 from oslo_log import log as logging
 
-from nova import utils
 from hyperv.i18n import _
 from hyperv.nova import constants
 from hyperv.nova import vmutils

hyperv/nova/rdpconsoleops.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from nova.console import type as ctype
 from oslo_log import log as logging
 
-from nova.console import type as ctype
 from hyperv.nova import hostops
 from hyperv.nova import utilsfactory
 

hyperv/nova/snapshotops.py

@@ -18,11 +18,11 @@ Management class for VM snapshot operations.
 """
 import os
 
+from nova.compute import task_states
+from nova.image import glance
 from oslo_config import cfg
 from oslo_log import log as logging
 
-from nova.compute import task_states
-from nova.image import glance
 from hyperv.i18n import _LW
 from hyperv.nova import utilsfactory
 

hyperv/nova/vmops.py

@@ -22,6 +22,13 @@ import os
 import time
 
 from eventlet import timeout as etimeout
+from nova.api.metadata import base as instance_metadata
+from nova import exception
+from nova.openstack.common import fileutils
+from nova.openstack.common import loopingcall
+from nova import utils
+from nova.virt import configdrive
+from nova.virt import hardware
 from oslo_concurrency import processutils
 from oslo_config import cfg
 from oslo_log import log as logging
@@ -30,13 +37,6 @@ from oslo_utils import importutils
 from oslo_utils import units
 from oslo_utils import uuidutils
 
-from nova.api.metadata import base as instance_metadata
-from nova import exception
-from nova.openstack.common import fileutils
-from nova.openstack.common import loopingcall
-from nova import utils
-from nova.virt import configdrive
-from nova.virt import hardware
 from hyperv.i18n import _, _LI, _LE, _LW
 from hyperv.nova import constants
 from hyperv.nova import imagecache

hyperv/nova/vmutils.py

@@ -25,10 +25,10 @@ import uuid
 if sys.platform == 'win32':
     import wmi
 
+from nova import exception
 from oslo_config import cfg
 from oslo_log import log as logging
 
-from nova import exception
 from hyperv.i18n import _, _LW
 from hyperv.nova import constants
 from hyperv.nova import hostutils

hyperv/nova/volumeops.py

@@ -22,12 +22,12 @@ import os
 import re
 import time
 
+from nova import exception
+from nova.virt import driver
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_utils import excutils
 
-from nova import exception
-from nova.virt import driver
 from hyperv.i18n import _, _LE, _LW
 from hyperv.nova import utilsfactory
 from hyperv.nova import vmutils

hyperv/nova/volumeutils.py

@@ -26,10 +26,10 @@ http://www.microsoft.com/en-us/download/details.aspx?id=34750
 import re
 import time
 
+from nova import utils
 from oslo_config import cfg
 from oslo_log import log as logging
 
-from nova import utils
 from hyperv.i18n import _
 from hyperv.nova import basevolumeutils
 from hyperv.nova import vmutils

hyperv/nova/volumeutilsv2.py

@@ -24,11 +24,11 @@ import time
 if sys.platform == 'win32':
     import wmi
 
+from nova import utils
 from oslo_config import cfg
 from oslo_log import log as logging
 
 from hyperv.i18n import _
-from nova import utils
 from hyperv.nova import basevolumeutils
 from hyperv.nova import vmutils
 

hyperv/tests/test.py

@@ -21,15 +21,22 @@ inline callbacks.
 
 """
 
+import os
+
 import eventlet
 eventlet.monkey_patch(os=False)
 
 import copy
 import inspect
 import mock
-import os
 
 import fixtures
+from nova import objects
+from nova.objects import base as objects_base
+from nova.tests import fixtures as nova_fixtures
+from nova.tests.unit import conf_fixture
+from nova.tests.unit import policy_fixture
+from nova import utils
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_config import fixture as config_fixture
@@ -38,13 +45,6 @@ from oslo_log import log as logging
 from oslotest import moxstubout
 import testtools
 
-from nova import objects
-from nova.objects import base as objects_base
-from nova.tests import fixtures as nova_fixtures
-from nova.tests.unit import conf_fixture
-from nova.tests.unit import policy_fixture
-from nova import utils
-
 
 CONF = cfg.CONF
 CONF.import_opt('enabled', 'nova.api.openstack', group='osapi_v3')

hyperv/tests/unit/db_fakes.py

@@ -22,6 +22,7 @@ from nova.compute import task_states
 from nova.compute import vm_states
 from nova import db
 from nova import utils
+
 from hyperv.nova import constants
 
 

hyperv/tests/unit/test_hypervapi.py

@@ -23,9 +23,6 @@ import uuid
 
 import mock
 from mox3 import mox
-from oslo_config import cfg
-from oslo_utils import units
-
 from nova.api.metadata import base as instance_metadata
 from nova.compute import power_state
 from nova import context
@@ -40,6 +37,10 @@ from nova.tests.unit.image import fake as fake_image
 from nova import utils
 from nova.virt import configdrive
 from nova.virt import driver
+from nova.virt import images
+from oslo_config import cfg
+from oslo_utils import units
+
 from hyperv.nova import basevolumeutils
 from hyperv.nova import constants
 from hyperv.nova import driver as driver_hyperv
@@ -57,7 +58,6 @@ from hyperv.nova import volumeutilsv2
 from hyperv.tests import test
 from hyperv.tests.unit import db_fakes
 from hyperv.tests.unit import fake
-from nova.virt import images
 
 CONF = cfg.CONF
 CONF.import_opt('vswitch_name', 'hyperv.nova.vif', 'hyperv')

hyperv/tests/unit/test_imagecache.py

@@ -16,14 +16,14 @@
 import os
 
 import mock
-from oslo_config import cfg
-
 from nova import exception
 from nova import objects
-from hyperv.tests import fake_instance
 from nova.tests.unit.objects import test_flavor
+from oslo_config import cfg
+
 from hyperv.nova import constants
 from hyperv.nova import imagecache
+from hyperv.tests import fake_instance
 from hyperv.tests import test
 
 CONF = cfg.CONF

hyperv/tests/unit/test_ioutils.py

@@ -13,10 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.import mock
 
-import mock
-
 import os
 
+import mock
+
 from hyperv.nova import ioutils
 from hyperv.tests import test
 

hyperv/tests/unit/test_livemigrationops.py

@@ -16,9 +16,9 @@
 import mock
 from oslo_config import cfg
 
-from hyperv.tests import fake_instance
 from hyperv.nova import livemigrationops
 from hyperv.nova import vmutils
+from hyperv.tests import fake_instance
 from hyperv.tests.unit import test_base
 
 CONF = cfg.CONF

hyperv/tests/unit/test_migrationops.py

@@ -14,9 +14,9 @@
 
 import mock
 
-from hyperv.tests import fake_instance
 from hyperv.nova import migrationops
 from hyperv.nova import vmutils
+from hyperv.tests import fake_instance
 from hyperv.tests.unit import test_base
 
 

hyperv/tests/unit/test_snapshotops.py

@@ -16,10 +16,10 @@
 import os
 
 import mock
-
 from nova.compute import task_states
-from hyperv.tests import fake_instance
+
 from hyperv.nova import snapshotops
+from hyperv.tests import fake_instance
 from hyperv.tests.unit import test_base
 
 

hyperv/tests/unit/test_vmops.py

@@ -16,15 +16,15 @@ import os
 
 from eventlet import timeout as etimeout
 import mock
+from nova import exception
 from oslo_concurrency import processutils
 from oslo_config import cfg
 from oslo_utils import units
 
-from nova import exception
-from hyperv.tests import fake_instance
 from hyperv.nova import constants
 from hyperv.nova import vmops
 from hyperv.nova import vmutils
+from hyperv.tests import fake_instance
 from hyperv.tests.unit import test_base
 
 CONF = cfg.CONF

hyperv/tests/unit/test_vmutils.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 import mock
-
 from nova import exception
+
 from hyperv.nova import constants
 from hyperv.nova import vmutils
 from hyperv.tests import test

hyperv/tests/unit/test_volumeops.py

@@ -18,8 +18,8 @@ import contextlib
 import os
 
 import mock
-
 from nova import exception
+
 from hyperv.nova import pathutils
 from hyperv.nova import vmutils
 from hyperv.nova import volumeops