diff --git a/nova/cmd/manage.py b/nova/cmd/manage.py index 06e6d8c1eac7..6826da51f0bb 100644 --- a/nova/cmd/manage.py +++ b/nova/cmd/manage.py @@ -55,10 +55,10 @@ from __future__ import print_function -import netaddr import os import sys +import netaddr from oslo.config import cfg from nova.api.ec2 import ec2utils diff --git a/nova/ipv6/account_identifier.py b/nova/ipv6/account_identifier.py index cbf0eabfd107..4cc618b6a192 100644 --- a/nova/ipv6/account_identifier.py +++ b/nova/ipv6/account_identifier.py @@ -20,6 +20,7 @@ """IPv6 address generation with account identifier embedded.""" import hashlib + import netaddr from nova.openstack.common.gettextutils import _ diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 635d1ae678f2..6c64a27038f2 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -21,10 +21,10 @@ import calendar import inspect -import netaddr import os import re +import netaddr from oslo.config import cfg from nova import db diff --git a/nova/objects/utils.py b/nova/objects/utils.py index 674576353eef..bc5bc452c2ad 100644 --- a/nova/objects/utils.py +++ b/nova/objects/utils.py @@ -16,6 +16,7 @@ import datetime import iso8601 + import netaddr from nova.network import model as network_model diff --git a/nova/tests/api/openstack/compute/contrib/test_networks.py b/nova/tests/api/openstack/compute/contrib/test_networks.py index 8fbdf82735e0..1c2548456414 100644 --- a/nova/tests/api/openstack/compute/contrib/test_networks.py +++ b/nova/tests/api/openstack/compute/contrib/test_networks.py @@ -16,9 +16,9 @@ import copy import math -import netaddr import uuid +import netaddr from oslo.config import cfg import webob diff --git a/nova/tests/objects/test_objects.py b/nova/tests/objects/test_objects.py index 97d07e835ebb..9f8a36362728 100644 --- a/nova/tests/objects/test_objects.py +++ b/nova/tests/objects/test_objects.py @@ -15,6 +15,7 @@ import contextlib import datetime import iso8601 + import netaddr from nova.conductor import rpcapi as conductor_rpcapi diff --git a/nova/tests/virt/test_virt_drivers.py b/nova/tests/virt/test_virt_drivers.py index 88d04c4f7c81..674423b36ab7 100644 --- a/nova/tests/virt/test_virt_drivers.py +++ b/nova/tests/virt/test_virt_drivers.py @@ -16,10 +16,11 @@ import base64 import fixtures -import netaddr import sys import traceback +import netaddr + from nova.compute import manager from nova import exception from nova.openstack.common import importutils diff --git a/nova/virt/netutils.py b/nova/virt/netutils.py index fe0f3d46d43d..caf67e3ba722 100644 --- a/nova/virt/netutils.py +++ b/nova/virt/netutils.py @@ -25,7 +25,6 @@ import os import jinja2 import netaddr - from oslo.config import cfg from nova.network import model