diff --git a/compute/src/main/java/org/zstack/compute/vm/TfVmNicFactory.java b/compute/src/main/java/org/zstack/compute/vm/TfVmNicFactory.java index a8bba0a15e60a6de7f9e1dfdf8a448d165a9e26e..b316305a6b638a8b89b22b1f13ee722aac43e192 100644 --- a/compute/src/main/java/org/zstack/compute/vm/TfVmNicFactory.java +++ b/compute/src/main/java/org/zstack/compute/vm/TfVmNicFactory.java @@ -4,15 +4,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.zstack.core.cloudbus.CloudBus; import org.zstack.core.db.DatabaseFacade; import org.zstack.header.core.workflow.FlowException; -import org.zstack.header.network.l3.UsedIpInventory; -import org.zstack.header.network.l3.UsedIpVO; import org.zstack.header.vm.*; import org.zstack.identity.Account; import org.zstack.utils.Utils; import org.zstack.utils.logging.CLogger; -import java.util.ArrayList; -import java.util.List; import static org.zstack.core.Platform.err; @@ -30,7 +26,7 @@ public class TfVmNicFactory extends VmNicFactory { return type; } - public VmNicVO createVmNic(VmNicInventory nic, VmInstanceSpec spec, List ips) { + public VmNicVO createVmNic(VmNicInventory nic, VmInstanceSpec spec) { String acntUuid = Account.getAccountUuidOfResource(spec.getVmInventory().getUuid()); VmNicVO vnic = VmInstanceNicFactory.createVmNic(nic); @@ -41,17 +37,9 @@ public class TfVmNicFactory extends VmNicFactory { throw new FlowException(err(VmErrors.ALLOCATE_MAC_ERROR, "unable to find an available mac address after re-try 5 times, too many collisions")); } - List ipVOS = new ArrayList<>(); - for (UsedIpInventory ip : ips) { - /* update usedIpVo */ - UsedIpVO ipVO = dbf.findByUuid(ip.getUuid(), UsedIpVO.class); - ipVO.setVmNicUuid(vnic.getUuid()); - ipVOS.add(ipVO); - } - dbf.updateCollection(ipVOS); - vnic = dbf.reload(vnic); spec.getDestNics().add(VmNicInventory.valueOf(vnic)); + logger.debug(String.format("Create TFVNIC [%s] success.", vnic.getUuid())); return vnic; } }