From 817595daf864d40ac0fe47756914b2966394e825 Mon Sep 17 00:00:00 2001 From: "U-CITRITE\\\\koushikd" Date: Thu, 14 Jun 2012 14:24:39 +0530 Subject: [PATCH] Fix bug CS-15261 In case IP address is passed to deployVirtualMachine API, the default property on NIC was not getting set and as a result there was a failure down the line and VM creation was failing. Signed-off-by: U-CITRITE\koushikd Signed-off-by: Abhinandan Prateek --- CS-15261.patch | 0 server/src/com/cloud/vm/UserVmManagerImpl.java | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 CS-15261.patch diff --git a/CS-15261.patch b/CS-15261.patch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index ba76d220799..101e35a491e 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2347,11 +2347,12 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager if (defaultNetworkNumber == 0) { defaultNetworkNumber++; - profile.setDefaultNic(true); // if user requested specific ip for default network, add it if (defaultNetworkIp != null) { profile = new NicProfile(defaultNetworkIp); } + + profile.setDefaultNic(true); } networks.add(new Pair(network, profile));