Updated Branches: refs/heads/3.0.x ced4a3f30 -> 72073c3b9
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 <[email protected]> Signed-off-by: Abhinandan Prateek <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/72073c3b Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/72073c3b Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/72073c3b Branch: refs/heads/3.0.x Commit: 72073c3b94237c7d039af4e5e68d5a7c10011f74 Parents: ced4a3f Author: U-CITRITE\\koushikd <[email protected]> Authored: Thu Jun 14 14:24:39 2012 +0530 Committer: Abhinandan Prateek <[email protected]> Committed: Tue Jun 19 07:02:31 2012 +0100 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/72073c3b/CS-15261.patch ---------------------------------------------------------------------- diff --git a/CS-15261.patch b/CS-15261.patch new file mode 100644 index 0000000..e69de29 http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/72073c3b/server/src/com/cloud/vm/UserVmManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 63b85a5..d81ed7d 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -2346,11 +2346,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<NetworkVO, NicProfile>(network, profile));
