pep8 fixes

2 files changed, 31 insertions, 17 deletions

diff --git a/nova/network/manager.py b/nova/network/manager.py
index f6c7e35e0..9d0f080ba 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -615,8 +615,10 @@ class NetworkManager(manager.SchedulerDependentManager):
         req_net_ip = str(req_net.ip)
         req_size = network_size * num_networks
         if req_size > req_net.size:
-            raise ValueError(_("network_size * num_networks exceeds cidr size"))
-        adjusted_cidr = netaddr.IPNetwork(req_net_ip+'/'+str(significant_bits))
+            msg = "network_size * num_networks exceeds cidr size"
+            raise ValueError(_(msg))
+        adjusted_cidr_str = req_net_ip + '/' + str(significant_bits)
+        adjusted_cidr = netaddr.IPNetwork(adjusted_cidr_str)
         all_req_nets = [adjusted_cidr]
         try:
             used_nets = self.db.network_get_all(context)
@@ -627,7 +629,8 @@ class NetworkManager(manager.SchedulerDependentManager):
             raise ValueError(_("cidr already in use"))
         for adjusted_cidr_supernet in adjusted_cidr.supernet():
             if adjusted_cidr_supernet in used_cidrs:
-                raise ValueError(_("requested cidr (%s) conflicts with existing supernet (%s)" % (str(adjusted_cidr), str(adjusted_cidr_supernet))))
+                msg = "requested cidr (%s) conflicts with existing supernet"
+                raise ValueError(_(msg % str(adjusted_cidr)))
         # split supernet into subnets
         if num_networks >= 2:
             next_cidr = adjusted_cidr
@@ -648,7 +651,8 @@ class NetworkManager(manager.SchedulerDependentManager):
         all_req_nets = list(set(all_req_nets))
         # after splitting ensure there were enough to satisfy the num_networks
         if len(all_req_nets) < num_networks:
-            raise ValueError(_("Not enough subnets avail to satisfy requested num_networks"))
+            msg = "Not enough subnets avail to satisfy requested num_networks"
+            raise ValueError(_(msg))
         return all_req_nets
 
     def create_networks(self, context, label, cidr, multi_host, num_networks,
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index 8a851cf76..1f5305b1d 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -297,28 +297,32 @@ class CommonNetworkTestCase(test.TestCase):
         manager = self.FakeNetworkManager()
         self.mox.StubOutWithMock(manager.db, 'network_get_all')
         ctxt = mox.IgnoreArg()
-        manager.db.network_get_all(ctxt).AndReturn([{'id': 1, 'cidr': '192.168.2.0/24'}])
+        manager.db.network_get_all(ctxt).AndReturn([{'id': 1,
+                                     'cidr': '192.168.2.0/24'}])
         self.mox.ReplayAll()
         nets = manager._validate_cidrs(None, '192.168.0.0/16', 4, 256)
         self.assertEqual(4, len(nets))
         cidrs = [str(net) for net in nets]
-        exp_cidrs = ['192.168.0.0', '192.168.1.0', '192.168.3.0', '192.168.4.0']
+        exp_cidrs = ['192.168.0.0', '192.168.1.0', '192.168.3.0',
+                     '192.168.4.0']
         for exp_cidr in exp_cidrs:
-            self.assertTrue(exp_cidr+'/24' in cidrs)
+            self.assertTrue(exp_cidr + '/24' in cidrs)
         self.assertFalse('192.168.2.0/24' in cidrs)
 
-    def test__validate_cidrs_split_cidr_smaller_subnet_in_use_middle_of_range(self):
+    def test__validate_cidrs_split_cidr_smaller_subnet_in_use(self):
         manager = self.FakeNetworkManager()
         self.mox.StubOutWithMock(manager.db, 'network_get_all')
         ctxt = mox.IgnoreArg()
-        manager.db.network_get_all(ctxt).AndReturn([{'id': 1, 'cidr': '192.168.2.0/25'}])
+        manager.db.network_get_all(ctxt).AndReturn([{'id': 1,
+                                     'cidr': '192.168.2.0/25'}])
         self.mox.ReplayAll()
         nets = manager._validate_cidrs(None, '192.168.0.0/16', 4, 256)
         self.assertEqual(4, len(nets))
         cidrs = [str(net) for net in nets]
-        exp_cidrs = ['192.168.0.0', '192.168.1.0', '192.168.3.0', '192.168.4.0']
+        exp_cidrs = ['192.168.0.0', '192.168.1.0', '192.168.3.0',
+                     '192.168.4.0']
         for exp_cidr in exp_cidrs:
-            self.assertTrue(exp_cidr+'/24' in cidrs)
+            self.assertTrue(exp_cidr + '/24' in cidrs)
         self.assertFalse('192.168.2.0/24' in cidrs)
 
     def test__validate_cidrs_one_in_use(self):
@@ -331,7 +335,8 @@ class CommonNetworkTestCase(test.TestCase):
         manager = self.FakeNetworkManager()
         self.mox.StubOutWithMock(manager.db, 'network_get_all')
         ctxt = mox.IgnoreArg()
-        manager.db.network_get_all(ctxt).AndReturn([{'id': 1, 'cidr': '192.168.0.0/24'}])
+        manager.db.network_get_all(ctxt).AndReturn([{'id': 1,
+                                     'cidr': '192.168.0.0/24'}])
         self.mox.ReplayAll()
         # ValueError: cidr already in use
         args = [None, '192.168.0.0/24', 1, 256]
@@ -340,7 +345,8 @@ class CommonNetworkTestCase(test.TestCase):
     def test__validate_cidrs_too_many(self):
         manager = self.FakeNetworkManager()
         args = [None, '192.168.0.0/24', 200, 256]
-        # ValueError: Not enough subnets avail to satisfy requested num_networks
+        # ValueError: Not enough subnets avail to satisfy requested
+        #             num_networks
         self.assertRaises(ValueError, manager._validate_cidrs, *args)
 
     def test__validate_cidrs_split_partial(self):
@@ -355,17 +361,21 @@ class CommonNetworkTestCase(test.TestCase):
         manager = self.FakeNetworkManager()
         self.mox.StubOutWithMock(manager.db, 'network_get_all')
         ctxt = mox.IgnoreArg()
-        manager.db.network_get_all(ctxt).AndReturn([{'id': 1, 'cidr': '192.168.0.0/8'}])
+        manager.db.network_get_all(ctxt).AndReturn([{'id': 1,
+                                      'cidr': '192.168.0.0/8'}])
         self.mox.ReplayAll()
         args = [None, '192.168.0.0/24', 1, 256]
-        # ValueError: requested cidr (192.168.0.0/24) conflicts with existing supernet (192.0.0.0/8)
+        # ValueError: requested cidr (192.168.0.0/24) conflicts
+        #             with existing supernet
         self.assertRaises(ValueError, manager._validate_cidrs, *args)
 #
 #    def test_create_networks_cidr_already_used(self):
 #        mockany = self.mox.CreateMockAnything()
 #        manager = self.FakeNetworkManager()
 #        self.mox.StubOutWithMock(manager.db, 'network_get_by_cidr')
-#        manager.db.network_get_by_cidr(mox.IgnoreArg(), '192.168.0.0/24').AndReturn(mockany)
+#        manager.db.network_get_by_cidr(mox.IgnoreArg(), '192.168.0.0/24')\
+#                                       .AndReturn(mockany)
 #        self.mox.ReplayAll()
-#        args = [None, 'foo', '192.168.0.0/24', None, 1, 256, 'fd00::/48', None, None, None]
+#        args = [None, 'foo', '192.168.0.0/24', None, 1, 256,
+#                 'fd00::/48', None, None, None]
 #        self.assertRaises(ValueError, manager.create_networks, *args)