move the FakeNetworkManager into fake_network

2 files changed, 73 insertions, 73 deletions

diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py
index 142206755..4185668b1 100644
--- a/nova/tests/fake_network.py
+++ b/nova/tests/fake_network.py
@@ -16,8 +16,8 @@
 # under the License.
 
 from nova import db
+from nova import exception
 from nova import flags
-from nova import test
 from nova.network import manager as network_manager
 
 
@@ -64,6 +64,58 @@ class FakeModel(dict):
             return self[name]
 
 
+class FakeNetworkManager(network_manager.NetworkManager):
+    """This NetworkManager doesn't call the base class so we can bypass all
+    inherited service cruft and just perform unit tests.
+    """
+
+    class FakeDB:
+        def fixed_ip_get_by_instance(self, context, instance_id):
+            return [dict(address='10.0.0.0'),  dict(address='10.0.0.1'),
+                    dict(address='10.0.0.2')]
+
+        def network_get_by_cidr(self, context, cidr):
+            raise exception.NetworkNotFoundForCidr()
+
+        def network_create_safe(self, context, net):
+            fakenet = dict(net)
+            fakenet['id'] = 999
+            return fakenet
+
+        def network_get_all(self, context):
+            raise exception.NoNetworksFound()
+
+        def virtual_interface_get_all(self, context):
+            floats = [{'address': '172.16.1.1'},
+                      {'address': '172.16.1.2'},
+                      {'address': '173.16.1.2'}]
+
+            vifs = [{'instance_id': 0,
+                     'fixed_ipv6': '2001:db8::dcad:beff:feef:1',
+                     'fixed_ips': [{'address': '172.16.0.1',
+                                    'floating_ips': [floats[0]]}]},
+                    {'instance_id': 1,
+                     'fixed_ipv6': '2001:db8::dcad:beff:feef:2',
+                     'fixed_ips': [{'address': '172.16.0.2',
+                                    'floating_ips': [floats[1]]}]},
+                    {'instance_id': 2,
+                     'fixed_ipv6': '2002:db8::dcad:beff:feef:2',
+                     'fixed_ips': [{'address': '173.16.0.2',
+                                    'floating_ips': [floats[2]]}]}]
+            return vifs
+
+
+    def __init__(self):
+        self.db = self.FakeDB()
+        self.deallocate_called = None
+
+    def deallocate_fixed_ip(self, context, address):
+        self.deallocate_called = address
+
+    def _create_fixed_ips(self, context, network_id):
+        pass
+
+
 flavor = {'id': 0,
           'name': 'fake_flavor',
           'memory_mb': 2048,
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index 30673050f..19ccd8c18 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -438,75 +438,23 @@ class VlanNetworkTestCase(test.TestCase):
 
 
 class CommonNetworkTestCase(test.TestCase):
-
-    class FakeNetworkManager(network_manager.NetworkManager):
-        """This NetworkManager doesn't call the base class so we can bypass all
-        inherited service cruft and just perform unit tests.
-        """
-
-        class FakeDB:
-            def fixed_ip_get_by_instance(self, context, instance_id):
-                return [dict(address='10.0.0.0'),  dict(address='10.0.0.1'),
-                        dict(address='10.0.0.2')]
-
-            def network_get_by_cidr(self, context, cidr):
-                raise exception.NetworkNotFoundForCidr()
-
-            def network_create_safe(self, context, net):
-                fakenet = dict(net)
-                fakenet['id'] = 999
-                return fakenet
-
-            def network_get_all(self, context):
-                raise exception.NoNetworksFound()
-
-            def virtual_interface_get_all(self, context):
-                floats = [{'address': '172.16.1.1'},
-                          {'address': '172.16.1.2'},
-                          {'address': '173.16.1.2'}]
-
-                vifs = [{'instance_id': 0,
-                         'fixed_ipv6': '2001:db8::dcad:beff:feef:1',
-                         'fixed_ips': [{'address': '172.16.0.1',
-                                        'floating_ips': [floats[0]]}]},
-                        {'instance_id': 1,
-                         'fixed_ipv6': '2001:db8::dcad:beff:feef:2',
-                         'fixed_ips': [{'address': '172.16.0.2',
-                                        'floating_ips': [floats[1]]}]},
-                        {'instance_id': 2,
-                         'fixed_ipv6': '2002:db8::dcad:beff:feef:2',
-                         'fixed_ips': [{'address': '173.16.0.2',
-                                        'floating_ips': [floats[2]]}]}]
-                return vifs
-
-
-        def __init__(self):
-            self.db = self.FakeDB()
-            self.deallocate_called = None
-
-        def deallocate_fixed_ip(self, context, address):
-            self.deallocate_called = address
-
-        def _create_fixed_ips(self, context, network_id):
-            pass
-
     def fake_create_fixed_ips(self, context, network_id):
         return None
 
     def test_remove_fixed_ip_from_instance(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         manager.remove_fixed_ip_from_instance(None, 99, '10.0.0.1')
 
         self.assertEquals(manager.deallocate_called, '10.0.0.1')
 
     def test_remove_fixed_ip_from_instance_bad_input(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         self.assertRaises(exception.FixedIpNotFoundForSpecificInstance,
                           manager.remove_fixed_ip_from_instance,
                           None, 99, 'bad input')
 
     def test_validate_cidrs(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         nets = manager.create_networks(None, 'fake', '192.168.0.0/24',
                                        False, 1, 256, None, None, None,
                                        None)
@@ -515,7 +463,7 @@ class CommonNetworkTestCase(test.TestCase):
         self.assertTrue('192.168.0.0/24' in cidrs)
 
     def test_validate_cidrs_split_exact_in_half(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         nets = manager.create_networks(None, 'fake', '192.168.0.0/24',
                                        False, 2, 128, None, None, None,
                                        None)
@@ -525,7 +473,7 @@ class CommonNetworkTestCase(test.TestCase):
         self.assertTrue('192.168.0.128/25' in cidrs)
 
     def test_validate_cidrs_split_cidr_in_use_middle_of_range(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         self.mox.StubOutWithMock(manager.db, 'network_get_all')
         ctxt = mox.IgnoreArg()
         manager.db.network_get_all(ctxt).AndReturn([{'id': 1,
@@ -543,7 +491,7 @@ class CommonNetworkTestCase(test.TestCase):
         self.assertFalse('192.168.2.0/24' in cidrs)
 
     def test_validate_cidrs_smaller_subnet_in_use(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         self.mox.StubOutWithMock(manager.db, 'network_get_all')
         ctxt = mox.IgnoreArg()
         manager.db.network_get_all(ctxt).AndReturn([{'id': 1,
@@ -556,7 +504,7 @@ class CommonNetworkTestCase(test.TestCase):
         self.assertRaises(ValueError, manager.create_networks, *args)
 
     def test_validate_cidrs_split_smaller_cidr_in_use(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         self.mox.StubOutWithMock(manager.db, 'network_get_all')
         ctxt = mox.IgnoreArg()
         manager.db.network_get_all(ctxt).AndReturn([{'id': 1,
@@ -573,7 +521,7 @@ class CommonNetworkTestCase(test.TestCase):
         self.assertFalse('192.168.2.0/24' in cidrs)
 
     def test_validate_cidrs_split_smaller_cidr_in_use2(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         self.mox.StubOutWithMock(manager.db, 'network_get_all')
         ctxt = mox.IgnoreArg()
         manager.db.network_get_all(ctxt).AndReturn([{'id': 1,
@@ -589,7 +537,7 @@ class CommonNetworkTestCase(test.TestCase):
         self.assertFalse('192.168.2.0/27' in cidrs)
 
     def test_validate_cidrs_split_all_in_use(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         self.mox.StubOutWithMock(manager.db, 'network_get_all')
         ctxt = mox.IgnoreArg()
         in_use = [{'id': 1, 'cidr': '192.168.2.9/29'},
@@ -605,14 +553,14 @@ class CommonNetworkTestCase(test.TestCase):
         self.assertRaises(ValueError, manager.create_networks, *args)
 
     def test_validate_cidrs_one_in_use(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         args = (None, 'fake', '192.168.0.0/24', False, 2, 256, None, None,
                 None, None)
         # ValueError: network_size * num_networks exceeds cidr size
         self.assertRaises(ValueError, manager.create_networks, *args)
 
     def test_validate_cidrs_already_used(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         self.mox.StubOutWithMock(manager.db, 'network_get_all')
         ctxt = mox.IgnoreArg()
         manager.db.network_get_all(ctxt).AndReturn([{'id': 1,
@@ -624,7 +572,7 @@ class CommonNetworkTestCase(test.TestCase):
         self.assertRaises(ValueError, manager.create_networks, *args)
 
     def test_validate_cidrs_too_many(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         args = (None, 'fake', '192.168.0.0/24', False, 200, 256, None, None,
                 None, None)
         # ValueError: Not enough subnets avail to satisfy requested
@@ -632,7 +580,7 @@ class CommonNetworkTestCase(test.TestCase):
         self.assertRaises(ValueError, manager.create_networks, *args)
 
     def test_validate_cidrs_split_partial(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         nets = manager.create_networks(None, 'fake', '192.168.0.0/16',
                                        False, 2, 256, None, None, None, None)
         returned_cidrs = [str(net['cidr']) for net in nets]
@@ -640,7 +588,7 @@ class CommonNetworkTestCase(test.TestCase):
         self.assertTrue('192.168.1.0/24' in returned_cidrs)
 
     def test_validate_cidrs_conflict_existing_supernet(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         self.mox.StubOutWithMock(manager.db, 'network_get_all')
         ctxt = mox.IgnoreArg()
         fakecidr = [{'id': 1, 'cidr': '192.168.0.0/8'}]
@@ -654,7 +602,7 @@ class CommonNetworkTestCase(test.TestCase):
 
     def test_create_networks(self):
         cidr = '192.168.0.0/24'
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         self.stubs.Set(manager, '_create_fixed_ips',
                                 self.fake_create_fixed_ips)
         args = [None, 'foo', cidr, None, 1, 256, 'fd00::/48', None, None,
@@ -662,7 +610,7 @@ class CommonNetworkTestCase(test.TestCase):
         self.assertTrue(manager.create_networks(*args))
 
     def test_create_networks_cidr_already_used(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         self.mox.StubOutWithMock(manager.db, 'network_get_all')
         ctxt = mox.IgnoreArg()
         fakecidr = [{'id': 1, 'cidr': '192.168.0.0/24'}]
@@ -674,7 +622,7 @@ class CommonNetworkTestCase(test.TestCase):
 
     def test_create_networks_many(self):
         cidr = '192.168.0.0/16'
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         self.stubs.Set(manager, '_create_fixed_ips',
                                 self.fake_create_fixed_ips)
         args = [None, 'foo', cidr, None, 10, 256, 'fd00::/48', None, None,
@@ -683,7 +631,7 @@ class CommonNetworkTestCase(test.TestCase):
 
 
     def test_get_instance_ids_by_ip_regex(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         _vifs = manager.db.virtual_interface_get_all(None)
 
         # Greedy get eveything
@@ -725,7 +673,7 @@ class CommonNetworkTestCase(test.TestCase):
         self.assertEqual(res[1]['instance_id'], _vifs[2]['instance_id'])
 
     def test_get_instance_ids_by_ipv6_regex(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         _vifs = manager.db.virtual_interface_get_all(None)
 
         # Greedy get eveything
@@ -766,7 +714,7 @@ class CommonNetworkTestCase(test.TestCase):
         self.assertEqual(res[1]['instance_id'], _vifs[2]['instance_id'])
 
     def test_get_instance_ids_by_ip(self):
-        manager = self.FakeNetworkManager()
+        manager = fake_network.FakeNetworkManager()
         _vifs = manager.db.virtual_interface_get_all(None)
 
         # No regex for you!