From: Wu Wenxiang Date: Tue, 10 Dec 2013 12:42:07 +0000 (+0800) Subject: Remove start index 0 in range() X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=74f0b74b55c97dda1ffd84a6fcab3f7c6478b50f;p=openstack-build%2Fneutron-build.git Remove start index 0 in range() Remove the useless arg ("start index" = 0) in files, since its default value is 0, to make code cleaner. Fixes bug #1259560 Change-Id: Id595630f97b21cc84aefc39b31e7f09f5fb8deb9 --- diff --git a/neutron/plugins/nicira/common/sync.py b/neutron/plugins/nicira/common/sync.py index 67a54b5b6..2f11a7f23 100644 --- a/neutron/plugins/nicira/common/sync.py +++ b/neutron/plugins/nicira/common/sync.py @@ -475,7 +475,7 @@ class NvpSynchronizer(): results, cursor, total_size = nvplib.get_single_query_page( uri, self._cluster, cursor, min(page_size, nvplib.MAX_PAGE_SIZE)) - for _req in range(0, num_requests - 1): + for _req in range(num_requests - 1): # If no cursor is returned break the cycle as there is no # actual need to perform multiple requests (all fetched) # This happens when the overall size of resources exceeds diff --git a/neutron/tests/unit/nicira/test_nvp_sync.py b/neutron/tests/unit/nicira/test_nvp_sync.py index a39441b1d..c0adfd3fb 100644 --- a/neutron/tests/unit/nicira/test_nvp_sync.py +++ b/neutron/tests/unit/nicira/test_nvp_sync.py @@ -350,14 +350,14 @@ class NvpSyncTestCase(base.BaseTestCase): networks = [] ports = [] routers = [] - for i in range(0, net_size): + for i in range(net_size): net = self._plugin.create_network(ctx, network(i)) networks.append(net) self._plugin.create_subnet(ctx, subnet(i, net['id'])) - for j in range(0, port_size): + for j in range(port_size): ports.append(self._plugin.create_port( ctx, port("%s-%s" % (i, j), net['id']))) - for i in range(0, router_size): + for i in range(router_size): routers.append(self._plugin.create_router(ctx, router(i))) # Do not return anything as the user does need the actual # data created @@ -627,7 +627,7 @@ class NvpSyncTestCase(base.BaseTestCase): NvpApiClient.RequestTimeout) # chunk size won't matter here sp = sync.SyncParameters(999) - for i in range(0, 10): + for i in range(10): self.assertEqual( min(64, 2 ** i), self._plugin._synchronizer._synchronize_state(sp)) diff --git a/neutron/tests/unit/nicira/test_nvplib.py b/neutron/tests/unit/nicira/test_nvplib.py index 3694e0b50..acb85c665 100644 --- a/neutron/tests/unit/nicira/test_nvplib.py +++ b/neutron/tests/unit/nicira/test_nvplib.py @@ -594,7 +594,7 @@ class TestNvplibLogicalRouters(NvplibTestCase): def test_get_lrouters(self): lrouter_uuids = [nvplib.create_lrouter( self.fake_cluster, 'pippo', 'fake-lrouter-%s' % k, - '10.0.0.1')['uuid'] for k in range(0, 3)] + '10.0.0.1')['uuid'] for k in range(3)] routers = nvplib.get_lrouters(self.fake_cluster, 'pippo') for router in routers: self.assertIn(router['uuid'], lrouter_uuids) @@ -691,7 +691,7 @@ class TestNvplibLogicalRouters(NvplibTestCase): self.fake_cluster, lrouter['uuid'], 'pippo', 'qp_id_%s' % k, 'port-%s' % k, True, ['192.168.0.%s' % k], '00:11:22:33:44:55')['uuid'] - for k in range(0, 3)] + for k in range(3)] ports = nvplib.query_lrouter_lports(self.fake_cluster, lrouter['uuid']) self.assertEqual(len(ports), 3) for res_port in ports: @@ -1402,7 +1402,7 @@ class TestNvplibLogicalPorts(NvplibTestCase): nvplib.create_lport( self.fake_cluster, lswitch['uuid'], 'pippo', 'qportid-%s' % k, 'port-%s' % k, 'deviceid-%s' % k, True)['uuid'] - for k in range(0, 2)] + for k in range(2)] switch_port_uuids.append(lport['uuid']) ports = nvplib.query_lswitch_lports(self.fake_cluster, lswitch['uuid']) self.assertEqual(len(ports), 3) diff --git a/neutron/tests/unit/services/firewall/agents/varmour/test_varmour_router.py b/neutron/tests/unit/services/firewall/agents/varmour/test_varmour_router.py index 410821eda..b56114380 100644 --- a/neutron/tests/unit/services/firewall/agents/varmour/test_varmour_router.py +++ b/neutron/tests/unit/services/firewall/agents/varmour/test_varmour_router.py @@ -95,7 +95,7 @@ class TestVarmourRouter(base.BaseTestCase): def _add_internal_ports(self, router, port_count=1): self._del_all_internal_ports(router) - for i in range(0, port_count): + for i in range(port_count): port = {'id': _uuid(), 'network_id': _uuid(), 'admin_state_up': True, @@ -114,7 +114,7 @@ class TestVarmourRouter(base.BaseTestCase): def _add_floating_ips(self, router, port_count=1): self._del_all_floating_ips(router) - for i in range(0, port_count): + for i in range(port_count): fip = {'id': _uuid(), 'port_id': router['gw_port']['id'], 'floating_ip_address': '172.24.4.%s' % (100 + i), diff --git a/neutron/tests/unit/services/firewall/drivers/varmour/test_varmour_fwaas.py b/neutron/tests/unit/services/firewall/drivers/varmour/test_varmour_fwaas.py index 95674f13f..79dfbfbb9 100644 --- a/neutron/tests/unit/services/firewall/drivers/varmour/test_varmour_fwaas.py +++ b/neutron/tests/unit/services/firewall/drivers/varmour/test_varmour_fwaas.py @@ -103,7 +103,7 @@ class TestBasicRouterOperations(base.BaseTestCase): def _add_internal_ports(self, router, port_count=1): self._del_all_internal_ports(router) - for i in range(0, port_count): + for i in range(port_count): port = {'id': _uuid(), 'network_id': _uuid(), 'admin_state_up': True, @@ -122,7 +122,7 @@ class TestBasicRouterOperations(base.BaseTestCase): def _add_floating_ips(self, router, port_count=1): self._del_all_floating_ips(router) - for i in range(0, port_count): + for i in range(port_count): fip = {'id': _uuid(), 'port_id': router['gw_port']['id'], 'floating_ip_address': '172.24.4.%s' % (100 + i), @@ -154,7 +154,7 @@ class TestBasicRouterOperations(base.BaseTestCase): def _add_firewall_rules(self, fw, rule_count=1): rules = [] - for i in range(0, rule_count): + for i in range(rule_count): rule = {'id': _uuid(), 'enabled': True, 'action': 'deny' if (i % 2 == 0) else 'allow', diff --git a/neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_plugin_driver.py b/neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_plugin_driver.py index d58e5bd5f..92ef2fd18 100644 --- a/neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_plugin_driver.py +++ b/neutron/tests/unit/services/loadbalancer/drivers/haproxy/test_plugin_driver.py @@ -92,7 +92,7 @@ class TestLoadBalancerCallbacks(TestLoadBalancerPluginBase): # add 3 pools and 2 vips directly to DB # to create 2 "ready" devices and one pool without vip pools = [] - for i in xrange(0, 3): + for i in xrange(3): pools.append(ldb.Pool(id=uuidutils.generate_uuid(), subnet_id=self._subnet_id, protocol="HTTP", diff --git a/neutron/tests/unit/test_db_plugin.py b/neutron/tests/unit/test_db_plugin.py index 1025a80b5..de362a89b 100644 --- a/neutron/tests/unit/test_db_plugin.py +++ b/neutron/tests/unit/test_db_plugin.py @@ -266,7 +266,7 @@ class NeutronDbPluginV2TestCase(testlib_api.WebTestCase): """Creates a bulk request for any kind of resource.""" objects = [] collection = "%ss" % resource - for i in range(0, number): + for i in range(number): obj = copy.deepcopy(data) obj[resource]['name'] = "%s_%s" % (name, i) if 'override' in kwargs and i in kwargs['override']: @@ -344,9 +344,9 @@ class NeutronDbPluginV2TestCase(testlib_api.WebTestCase): 'tenant_id': self._tenant_id}} # auto-generate cidrs as they should not overlap overrides = dict((k, v) - for (k, v) in zip(range(0, number), + for (k, v) in zip(range(number), [{'cidr': "10.0.%s.0/24" % num} - for num in range(0, number)])) + for num in range(number)])) kwargs.update({'override': overrides}) return self._create_bulk(fmt, number, 'subnet', base_data, **kwargs) diff --git a/neutron/tests/unit/test_l3_agent.py b/neutron/tests/unit/test_l3_agent.py index f6ad42663..fa48e71f0 100644 --- a/neutron/tests/unit/test_l3_agent.py +++ b/neutron/tests/unit/test_l3_agent.py @@ -360,7 +360,7 @@ class TestBasicRouterOperations(base.BaseTestCase): 'subnet': {'cidr': '19.4.4.0/24', 'gateway_ip': '19.4.4.1'}} int_ports = [] - for i in range(0, num_internal_ports): + for i in range(num_internal_ports): int_ports.append({'id': _uuid(), 'network_id': _uuid(), 'admin_state_up': True,