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") 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 {