From 75566780c4ad4446575d73089875f28b8fca2e95 Mon Sep 17 00:00:00 2001 From: edison Date: Wed, 27 Oct 2010 16:30:23 -0700 Subject: [PATCH 1/2] remove the no-updatable constraint on domr ram size --- core/src/com/cloud/vm/DomainRouterVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/cloud/vm/DomainRouterVO.java b/core/src/com/cloud/vm/DomainRouterVO.java index 99950d3859c..a191836dbe9 100755 --- a/core/src/com/cloud/vm/DomainRouterVO.java +++ b/core/src/com/cloud/vm/DomainRouterVO.java @@ -35,7 +35,7 @@ import com.cloud.utils.net.NetUtils; @PrimaryKeyJoinColumn(name="id") @DiscriminatorValue(value="DomainRouter") public class DomainRouterVO extends VMInstanceVO implements DomainRouter { - @Column(name="ram_size", updatable=false, nullable=false) + @Column(name="ram_size", nullable=false) private int ramSize; @Column(name="gateway") From f64f399d5dc41495d5c63250e4a59d1d6c29c3ca Mon Sep 17 00:00:00 2001 From: will Date: Wed, 27 Oct 2010 17:43:51 -0700 Subject: [PATCH 2/2] Fixed creating a VM using new query response paradigm in 2.2 UI --- ui/new/scripts/cloud.core2.instance.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index 9219684a72e..09840becb1a 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -825,12 +825,12 @@ function initVMWizard() { $("body").stopTime(timerKey); if (result.jobstatus == 1) { // Succeeded - vmToMidmenu(result.virtualmachine[0], $midmenuItem1); + vmToMidmenu(result.jobresult.deployvirtualmachineresponse, $midmenuItem1); bindClickToMidMenu($midmenuItem1, vmToRightPanel, getMidmenuId); - if (result.virtualmachine[0].passwordenabled == 'true') { - var extraMessage = "New password: " + result.virtualmachine[0].password; + if (result.jobresult.deployvirtualmachineresponse.passwordenabled == 'true') { + var extraMessage = "New password: " + result.jobresult.deployvirtualmachineresponse.password; afterAddingMidMenuItem($midmenuItem1, true, extraMessage); - var afterActionInfo = "Your instance has been successfully created. Your new password is : " + result.virtualmachine[0].password; + var afterActionInfo = "Your instance has been successfully created. Your new password is : " + result.jobresult.deployvirtualmachineresponse.password; $midmenuItem1.data("afterActionInfo", afterActionInfo); } else {