From c8ce0ce523e1b3e11960da63ce8be0f810954889 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Wed, 10 Apr 2013 01:47:29 +0200 Subject: Remove unnecessary parens. This is just some random code cleanup. It removes some unnecessary parens in some conditional statements to be more consistent with the style used elsewhere in the code. Change-Id: I49951c0ffe2b50e0dee50552eb1ddbf7ff871ecf --- nova/network/linux_net.py | 2 +- nova/network/manager.py | 4 ++-- nova/tests/api/ec2/test_cinder_cloud.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py index 4a63f275d..3ee5d7400 100644 --- a/nova/network/linux_net.py +++ b/nova/network/linux_net.py @@ -813,7 +813,7 @@ def initialize_gateway_device(dev, network_ref): if CONF.send_arp_for_ha and CONF.send_arp_for_ha_count > 0: send_arp_for_ip(network_ref['dhcp_server'], dev, CONF.send_arp_for_ha_count) - if(CONF.use_ipv6): + if CONF.use_ipv6: _execute('ip', '-f', 'inet6', 'addr', 'change', network_ref['cidr_v6'], 'dev', dev, run_as_root=True) diff --git a/nova/network/manager.py b/nova/network/manager.py index 0e668a164..572aeda38 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -1626,7 +1626,7 @@ class FlatDHCPManager(RPCAllocateFixedIP, floating_ips.FloatingIP, # NOTE(dprince): dhcp DB queries require elevated context elevated = context.elevated() self.driver.update_dhcp(elevated, dev, network) - if(CONF.use_ipv6): + if CONF.use_ipv6: self.driver.update_ra(context, dev, network) gateway = utils.get_my_linklocal(dev) self.db.network_update(context, network['id'], @@ -1846,7 +1846,7 @@ class VlanManager(RPCAllocateFixedIP, floating_ips.FloatingIP, NetworkManager): # NOTE(dprince): dhcp DB queries require elevated context elevated = context.elevated() self.driver.update_dhcp(elevated, dev, network) - if(CONF.use_ipv6): + if CONF.use_ipv6: self.driver.update_ra(context, dev, network) gateway = utils.get_my_linklocal(dev) self.db.network_update(context, network['id'], diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py index c29f77daa..61fc2f75c 100644 --- a/nova/tests/api/ec2/test_cinder_cloud.py +++ b/nova/tests/api/ec2/test_cinder_cloud.py @@ -747,10 +747,10 @@ class CinderCloudTestCase(test.TestCase): for vol in vols: self.assertTrue(str(vol['id']) == str(vol1_uuid) or str(vol['id']) == str(vol2_uuid)) - if(str(vol['id']) == str(vol1_uuid)): + if str(vol['id']) == str(vol1_uuid): self.volume_api.attach(self.context, vol, instance_uuid, '/dev/sdb') - elif(str(vol['id']) == str(vol2_uuid)): + elif str(vol['id']) == str(vol2_uuid): self.volume_api.attach(self.context, vol, instance_uuid, '/dev/sdc') -- cgit