Ensure that the netaddr import is in the 3rd party section
There were cases when the netaddr import was not in the correct place. Change-Id: I7715fcfa8cade6a78a2a58dffdc9cdca13b7d59c Closes-Bug: #1236744
This commit is contained in:
@@ -55,10 +55,10 @@
|
|||||||
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
|
|
||||||
import netaddr
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
import netaddr
|
||||||
from oslo.config import cfg
|
from oslo.config import cfg
|
||||||
|
|
||||||
from nova.api.ec2 import ec2utils
|
from nova.api.ec2 import ec2utils
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
"""IPv6 address generation with account identifier embedded."""
|
"""IPv6 address generation with account identifier embedded."""
|
||||||
|
|
||||||
import hashlib
|
import hashlib
|
||||||
|
|
||||||
import netaddr
|
import netaddr
|
||||||
|
|
||||||
from nova.openstack.common.gettextutils import _
|
from nova.openstack.common.gettextutils import _
|
||||||
|
|||||||
@@ -21,10 +21,10 @@
|
|||||||
|
|
||||||
import calendar
|
import calendar
|
||||||
import inspect
|
import inspect
|
||||||
import netaddr
|
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
|
|
||||||
|
import netaddr
|
||||||
from oslo.config import cfg
|
from oslo.config import cfg
|
||||||
|
|
||||||
from nova import db
|
from nova import db
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
import iso8601
|
import iso8601
|
||||||
|
|
||||||
import netaddr
|
import netaddr
|
||||||
|
|
||||||
from nova.network import model as network_model
|
from nova.network import model as network_model
|
||||||
|
|||||||
@@ -16,9 +16,9 @@
|
|||||||
|
|
||||||
import copy
|
import copy
|
||||||
import math
|
import math
|
||||||
import netaddr
|
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
|
import netaddr
|
||||||
from oslo.config import cfg
|
from oslo.config import cfg
|
||||||
import webob
|
import webob
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
import contextlib
|
import contextlib
|
||||||
import datetime
|
import datetime
|
||||||
import iso8601
|
import iso8601
|
||||||
|
|
||||||
import netaddr
|
import netaddr
|
||||||
|
|
||||||
from nova.conductor import rpcapi as conductor_rpcapi
|
from nova.conductor import rpcapi as conductor_rpcapi
|
||||||
|
|||||||
@@ -16,10 +16,11 @@
|
|||||||
|
|
||||||
import base64
|
import base64
|
||||||
import fixtures
|
import fixtures
|
||||||
import netaddr
|
|
||||||
import sys
|
import sys
|
||||||
import traceback
|
import traceback
|
||||||
|
|
||||||
|
import netaddr
|
||||||
|
|
||||||
from nova.compute import manager
|
from nova.compute import manager
|
||||||
from nova import exception
|
from nova import exception
|
||||||
from nova.openstack.common import importutils
|
from nova.openstack.common import importutils
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ import os
|
|||||||
|
|
||||||
import jinja2
|
import jinja2
|
||||||
import netaddr
|
import netaddr
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo.config import cfg
|
||||||
|
|
||||||
from nova.network import model
|
from nova.network import model
|
||||||
|
|||||||
Reference in New Issue
Block a user