Revision 1d04ef8b

b/snf-cyclades-app/synnefo/logic/tests.py
321 321
    def test_create(self, client):
322 322
        back_network = mfactory.BackendNetworkFactory(operstate='PENDING')
323 323
        net = back_network.network
324
        net.state = 'ACTIVE'
325
        net.save()
324 326
        back1 = back_network.backend
325 327

  
326 328
        back_network2 = mfactory.BackendNetworkFactory(operstate='PENDING',
......
336 338
        back_net = BackendNetwork.objects.get(id=back_network.id)
337 339
        self.assertEqual(back_net.operstate, 'ACTIVE')
338 340
        db_net = Network.objects.get(id=net.id)
339
        self.assertEqual(db_net.state, 'PENDING')
341
        self.assertEqual(db_net.state, 'ACTIVE')
340 342
        # msg from second backend network
341 343
        msg = self.create_msg(operation='OP_NETWORK_CONNECT',
342 344
                              network=net.backend_id,
......
351 353

  
352 354
    def test_create_offline_backend(self, client):
353 355
        """Test network creation when a backend is offline"""
354
        net = mfactory.NetworkFactory()
356
        net = mfactory.NetworkFactory(state='ACTIVE')
355 357
        bn1 = mfactory.BackendNetworkFactory(network=net)
356 358
        bn2 = mfactory.BackendNetworkFactory(network=net,
357 359
                                             backend__offline=True)
......
366 368
    def test_disconnect(self, client):
367 369
        bn1 = mfactory.BackendNetworkFactory(operstate='ACTIVE')
368 370
        net1 = bn1.network
369
        net1.operstate = 'ACTIVE'
371
        net1.state = "ACTIVE"
372
        net1.state = 'ACTIVE'
370 373
        net1.save()
371 374
        bn2 = mfactory.BackendNetworkFactory(operstate='ACTIVE',
372 375
                                             network=net1)
......
375 378
                              cluster=bn2.backend.clustername)
376 379
        update_network(client, msg)
377 380
        client.basic_ack.assert_called_once()
378
        self.assertEqual(Network.objects.get(id=net1.id).state, 'PENDING')
381
        self.assertEqual(Network.objects.get(id=net1.id).state, 'ACTIVE')
379 382
        self.assertEqual(BackendNetwork.objects.get(id=bn2.id).operstate,
380 383
                         'PENDING')
381 384

  
......
430 433
            update_network(client, msg)
431 434
        client.basic_ack.assert_called_once()
432 435
        new_net = Network.objects.get(id=net.id)
433
        self.assertEqual(new_net.state, 'DELETED')
434
        self.assertTrue(new_net.deleted)
436
        self.assertEqual(new_net.state, 'ACTIVE')
437
        self.assertFalse(new_net.deleted)
435 438

  
436 439
    def test_error_opcode(self, client):
437 440
        for state, _ in Network.OPER_STATES:

Also available in: Unified diff