Merge "Fix bug:range() is not same in py3.x and py2.x"

neutron/db/sqlalchemyutils.py

@@ -15,6 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from six.moves import xrange
 import sqlalchemy
 from sqlalchemy.orm.properties import RelationshipProperty
 

neutron/plugins/bigswitch/tests/test_server.py

@@ -27,6 +27,7 @@ from __future__ import print_function
 import json
 import re
 
+from six.moves import xrange
 from wsgiref.simple_server import make_server
 
 

neutron/plugins/brocade/vlanbm.py

@@ -21,6 +21,7 @@
 
 
 """A Vlan Bitmap class to handle allocation/de-allocation of vlan ids."""
+from six.moves import xrange
 
 from neutron.common import constants
 from neutron.plugins.brocade.db import models as brocade_db

neutron/plugins/cisco/db/n1kv_db_v2.py

@@ -21,6 +21,7 @@
 
 import netaddr
 import re
+from six.moves import xrange
 from sqlalchemy.orm import exc
 from sqlalchemy.sql import and_
 

neutron/plugins/hyperv/db.py

@@ -16,6 +16,7 @@
 #    under the License.
 # @author: Alessandro Pilotti, Cloudbase Solutions Srl
 
+from six.moves import xrange
 from sqlalchemy.orm import exc
 
 from neutron.common import exceptions as n_exc

neutron/plugins/linuxbridge/db/l2network_db_v2.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
+from six.moves import xrange
 from sqlalchemy.orm import exc
 
 from neutron.common import exceptions as n_exc

neutron/plugins/ml2/drivers/type_gre.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 from oslo.config import cfg
+from six.moves import xrange
 import sqlalchemy as sa
 from sqlalchemy.orm import exc as sa_exc
 

neutron/plugins/ml2/drivers/type_vlan.py

@@ -16,6 +16,7 @@
 import sys
 
 from oslo.config import cfg
+from six.moves import xrange
 import sqlalchemy as sa
 
 from neutron.common import constants as q_const

neutron/plugins/mlnx/db/mlnx_db_v2.py

@@ -15,6 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from six.moves import xrange
 from sqlalchemy.orm import exc
 
 from neutron.common import exceptions as n_exc

neutron/plugins/openvswitch/agent/ovs_neutron_agent.py

@@ -21,6 +21,7 @@ import time
 import eventlet
 import netaddr
 from oslo.config import cfg
+from six.moves import xrange
 
 from neutron.agent import l2population_rpc
 from neutron.agent.linux import ip_lib

neutron/plugins/openvswitch/ovs_db_v2.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from six.moves import xrange
 from sqlalchemy import func
 from sqlalchemy.orm import exc
 

neutron/services/loadbalancer/drivers/haproxy/cfg.py

@@ -17,6 +17,7 @@
 # @author: Mark McClain, DreamHost
 
 import itertools
+from six.moves import xrange
 
 from neutron.agent.linux import utils
 from neutron.plugins.common import constants as qconstants

neutron/tests/functional/agent/linux/test_async_process.py

@@ -17,6 +17,8 @@
 import eventlet
 import fixtures
 
+from six.moves import xrange
+
 from neutron.agent.linux import async_process
 from neutron.tests import base
 

neutron/tests/unit/bigswitch/test_router_db.py

@@ -23,6 +23,7 @@ import copy
 
 from mock import patch
 from oslo.config import cfg
+from six.moves import xrange
 from webob import exc
 
 from neutron.common.test_lib import test_config

neutron/tests/unit/cisco/n1kv/test_n1kv_db.py

@@ -18,6 +18,7 @@
 # @author: Abhishek Raut, Cisco Systems Inc.
 # @author: Rudrajit Tapadar, Cisco Systems Inc.
 
+from six.moves import xrange
 from sqlalchemy.orm import exc as s_exc
 from testtools import matchers
 

neutron/tests/unit/linuxbridge/test_lb_db.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 
 from oslo.config import cfg
+from six.moves import xrange
 import testtools
 from testtools import matchers
 

neutron/tests/unit/ml2/test_type_gre.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from six.moves import xrange
 import testtools
 from testtools import matchers
 

neutron/tests/unit/ml2/test_type_vxlan.py

@@ -15,6 +15,7 @@
 # @author: Kyle Mestery, Cisco Systems, Inc.
 
 from oslo.config import cfg
+from six.moves import xrange
 import testtools
 from testtools import matchers
 

neutron/tests/unit/mlnx/test_mlnx_db.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from six.moves import xrange
 from testtools import matchers
 
 from neutron.common import exceptions as n_exc

neutron/tests/unit/nec/test_nec_agent.py

@@ -21,6 +21,7 @@ import time
 
 import mock
 from oslo.config import cfg
+from six.moves import xrange
 import testtools
 
 from neutron.agent.linux import ovs_lib

neutron/tests/unit/nec/test_trema_driver.py

@@ -18,6 +18,7 @@
 import random
 
 import mock
+from six.moves import xrange
 
 from neutron.openstack.common import uuidutils
 from neutron.plugins.nec.common import ofc_client

neutron/tests/unit/openvswitch/test_ovs_db.py

@@ -17,6 +17,7 @@
 
 import mock
 from oslo.config import cfg
+from six.moves import xrange
 import testtools
 from testtools import matchers
 

neutron/tests/unit/services/loadbalancer/drivers/test_agent_driver_base.py

@@ -19,6 +19,7 @@
 import contextlib
 
 import mock
+from six.moves import xrange
 from webob import exc
 
 from neutron.common import exceptions

neutron/tests/unit/test_post_mortem_debug.py

@@ -18,6 +18,7 @@
 import sys
 
 import mock
+from six.moves import xrange
 
 from neutron.tests import base
 from neutron.tests import post_mortem_debug