Revision 2d762302

b/snf-cyclades-app/synnefo/logic/backend.py
428 428
    tags = network.backend_tag
429 429
    if network.dhcp:
430 430
        tags.append('nfdhcpd')
431
    tags = ','.join(tags)
431

  
432
    if network.public:
433
        conflicts_check = True
434
    else:
435
        conflicts_check = False
432 436

  
433 437
    try:
434 438
        bn = BackendNetwork.objects.get(network=network, backend=backend)
......
445 449
                                    gateway6=network.gateway6,
446 450
                                    network_type=network_type,
447 451
                                    mac_prefix=mac_prefix,
452
                                    conflicts_check=conflicts_check,
448 453
                                    tags=tags)
449 454

  
450 455

  
......
454 459

  
455 460
    mode = "routed" if "ROUTED" in network.type else "bridged"
456 461

  
462
    if network.public:
463
        conflicts_check = True
464
    else:
465
        conflicts_check = False
466

  
457 467
    depend_jobs = [depend_job] if depend_job else []
458 468
    with pooled_rapi_client(backend) as client:
459 469
        if group:
460 470
            client.ConnectNetwork(network.backend_id, group, mode,
461
                                  network.link, depend_jobs)
471
                                  network.link, conflicts_check, depend_jobs)
462 472
        else:
463 473
            for group in client.GetGroups():
464 474
                client.ConnectNetwork(network.backend_id, group, mode,
465
                                      network.link, depend_jobs)
475
                                      network.link, conflicts_check,
476
                                      depend_jobs)
466 477

  
467 478

  
468 479
def delete_network(network, backends=None, disconnect=True):

Also available in: Unified diff