Revision 3b2984dc snf-cyclades-app/synnefo/db/tests.py

b/snf-cyclades-app/synnefo/db/tests.py
52 52
        """Test a flavor object name method."""
53 53
        flavor = mfact.FlavorFactory(cpu=1, ram=1024, disk=40,
54 54
                                     disk_template="temp")
55
        self.assertEqual(flavor.name, "C1R1024D40temp", "flavor.name is not"
56
                " generated correctly. Name is %s instead of C1R1024D40temp" %
57
                flavor.name)
55
        self.assertEqual(
56
            flavor.name, "C1R1024D40temp", "flavor.name is not"
57
            " generated correctly. Name is %s instead of C1R1024D40temp" %
58
            flavor.name)
58 59

  
59 60

  
60 61
class BackendTest(TestCase):
......
194 195
                         len_backends + 3)
195 196

  
196 197
    def test_pool(self):
197
        pool = self.net.get_pool()
198
        pool = self.net.get_ip_pools()[0]
198 199
        pool.network = self.net
199 200
        self.assertTrue(isinstance(pool, IPPool))
200 201

  
201 202
    def test_reserve_ip(self):
202 203
        net1 = mfact.NetworkWithSubnetFactory(subnet__cidr='192.168.2.0/24')
204
        pool = net1.get_ip_pools()[0]
205
        self.assertTrue(pool.is_available('192.168.2.12'))
203 206
        net1.reserve_address('192.168.2.12')
204
        pool = net1.get_pool()
207
        pool = net1.get_ip_pools()[0]
205 208
        self.assertFalse(pool.is_available('192.168.2.12'))
206 209
        net1.release_address('192.168.2.12')
207
        pool = net1.get_pool()
210
        pool = net1.get_ip_pools()[0]
208 211
        self.assertTrue(pool.is_available('192.168.2.12'))
209 212

  
210 213

  

Also available in: Unified diff