diff options
| author | bhagyashris <bhagyashri.shewale@nttdata.com> | 2016-07-01 17:06:58 +0530 |
|---|---|---|
| committer | bhagyashris <bhagyashri.shewale@nttdata.com> | 2016-07-04 16:24:10 +0530 |
| commit | 046f34290df50fbf3d1887d8446c6f1c5396caae (patch) | |
| tree | 7dc3709aa620b2660afbc2b2060d84d0b89e13cc /tools | |
| parent | 4c4591f2cd887fdc22828e12f0c297c051bbd912 (diff) | |
| download | nova-046f34290df50fbf3d1887d8446c6f1c5396caae.tar.gz | |
Fix invalid import order
Made corrections in import order as per OpenStack import standards [1].
[1] http://docs.openstack.org/developer/hacking/#import-order-template
TrivialFix
Change-Id: Ieb63c7fc5becc68db8d68b3e6847321e77ceeed3
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/xenserver/populate_other_config.py | 5 | ||||
| -rwxr-xr-x | tools/xenserver/vm_vdi_cleaner.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/xenserver/populate_other_config.py b/tools/xenserver/populate_other_config.py index fcd08bc79a..f99ed29816 100644 --- a/tools/xenserver/populate_other_config.py +++ b/tools/xenserver/populate_other_config.py @@ -37,12 +37,13 @@ possible_topdir = os.getcwd() if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")): sys.path.insert(0, possible_topdir) +from oslo_config import cfg +from oslo_utils import uuidutils + from nova import config from nova.virt import virtapi from nova.virt.xenapi import driver as xenapi_driver from nova.virt.xenapi import vm_utils -from oslo_config import cfg -from oslo_utils import uuidutils cli_opts = [ cfg.BoolOpt('dry-run', diff --git a/tools/xenserver/vm_vdi_cleaner.py b/tools/xenserver/vm_vdi_cleaner.py index 0526d4eb17..09b172e85e 100755 --- a/tools/xenserver/vm_vdi_cleaner.py +++ b/tools/xenserver/vm_vdi_cleaner.py @@ -21,6 +21,7 @@ import os import sys from oslo_config import cfg +from oslo_utils import timeutils import XenAPI possible_topdir = os.getcwd() @@ -32,7 +33,6 @@ from nova import context import nova.conf from nova import db from nova import exception -from oslo_utils import timeutils from nova.virt import virtapi from nova.virt.xenapi import driver as xenapi_driver |