From 0b4c0e3e4662cbafafcdfed439bafcd68bf67ab2 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Tue, 20 Mar 2012 15:04:17 -0700 Subject: [PATCH] bug 7080: fix usage for kvm;Reviewed-by: kishan --- .../agent/resource/computing/LibvirtComputingResource.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java index f5c4f70d7d3..fa6e8162cc1 100644 --- a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java +++ b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java @@ -1185,10 +1185,13 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv if (!vlanAllocatedToVM.containsKey(ip.getVlanId())) { /*plug a vif into router*/ VifHotPlug(conn, routerName, ip.getVlanId(), ip.getVifMacAddress()); - vlanAllocatedToVM.put(ip.getVlanId(), nicPos++); + vlanAllocatedToVM.put(ip.getVlanId(), nicPos); + + networkUsage(routerIp, "addVif", "eth" + nicPos); + nicPos++; } nicNum = vlanAllocatedToVM.get(ip.getVlanId()); - networkUsage(routerIp, "addVif", "eth" + nicNum); + result = _virtRouterResource.assignPublicIpAddress(routerName, routerIp, ip.getPublicIp(), ip.isAdd(), ip.isFirstIP(), ip.isSourceNat(), ip.getVlanId(), ip.getVlanGateway(), ip.getVlanNetmask(),