Revision ddffd973

b/snf-cyclades-app/synnefo/api/tests/floating_ips.py
33 33

  
34 34
from django.utils import simplejson as json
35 35
from snf_django.utils.testing import BaseAPITest, mocked_quotaholder
36
from synnefo.db.models import IPAddress, Network
36
from synnefo.db.models import IPAddress, Network, Subnet, IPPoolTable
37 37
from synnefo.db import models_factory as mf
38 38

  
39 39
from mock import patch, Mock
......
127 127
        """Test reserve FIP without specifying network."""
128 128
        request = {"floatingip": {}}
129 129
        # delete all pools..
130
        IPPoolTable.objects.all().delete()
131
        Subnet.objects.all().delete()
130 132
        Network.objects.all().delete()
131 133
        # CASE: no floating IP pool
132 134
        with mocked_quotaholder():
b/snf-cyclades-app/synnefo/logic/tests/reconciliation.py
244 244
                                             "external_reservations": ""}]
245 245
        self.reconciler.reconcile_networks()
246 246
        self.assertTrue(net1.backend_networks
247
                            .filter(backend=self.backend).exists())
248
        # ..but not if it is destroying
249
        net1.backend_networks.all().delete()
250
        net1.action = "DESTROY"
251
        net1.save()
252
        self.reconciler.reconcile_networks()
253
        self.assertFalse(net1.backend_networks
254
                             .filter(backend=self.backend).exists())
255
        # or network is public!
256
        net1.action = "CREATE"
257
        net1.public = True
258
        net1.save()
259
        self.reconciler.reconcile_networks()
260
        self.assertFalse(net1.backend_networks
261
                             .filter(backend=self.backend).exists())
262
        # Test creation if network is a floating IP pool
263
        net2 = mfactory.NetworkWithSubnetFactory(floating_ip_pool=True)
264
        mrapi().GetNetworks.return_value = []
265
        self.assertEqual(net2.backend_networks.count(), 0)
266
        self.reconciler.reconcile_networks()
267
        self.assertTrue(net2.backend_networks
268
                            .filter(backend=self.backend).exists())
247
                        .filter(backend=self.backend).exists())
269 248

  
270 249
    def test_stale_network(self, mrapi):
271 250
        # Test that stale network will be deleted from DB, if network action is

Also available in: Unified diff