Revision ae2da8a2 snf-cyclades-app/synnefo/logic/servers.py

b/snf-cyclades-app/synnefo/logic/servers.py
485 485
        ipaddress.save()
486 486

  
487 487
    if machine is not None:
488
        # Associate Port(NIC) with VirtualMachine
489
        port = associate_port_with_machine(port, machine)
490
        # Send job to connect port to instance
488
        # Connect port to the instance.
491 489
        machine = connect(machine, network, port)
492 490
        jobID = machine.task_job_id
493 491
        log.info("Created Port %s with IP %s. Ganeti Job: %s",
......
506 504
    IPAddressLog if the port has a public IPv4 address from a public network.
507 505

  
508 506
    """
507
    if port.machine is not None:
508
        raise faults.Conflict("Port %s is already in use." % port.id)
509 509
    if port.network.public:
510 510
        ipv4_address = port.ipv4_address
511 511
        if ipv4_address is not None:

Also available in: Unified diff