From 59c382e4af8ae264fcb6b322e481289df5013941 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Fri, 18 May 2012 15:03:43 -0700 Subject: [PATCH 1/4] CS-14703 fixed --- setup/bindir/cloud-setup-databases.in | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in index 5e74817db71..e488611c38f 100755 --- a/setup/bindir/cloud-setup-databases.in +++ b/setup/bindir/cloud-setup-databases.in @@ -242,15 +242,24 @@ for full help self.info(None, True) awsApiDbDir = '/usr/share/cloud/setup/bridge/db' - for f in ["cloudbridge_db.sql", "deploy-db-bridge.sh"]: + for f in ["cloudbridge_db.sql"]: p = os.path.join(awsApiDbDir,f) if not os.path.exists(p): continue text = file(p).read() for t, r in replacements: text = text.replace(t,r) - file(p, 'w').write(text) + self.info("Applying %s"%p) + self.runMysql(text, p, True) + self.info(None, True) - awsApiCmds = ['cd %s;'%awsApiDbDir, 'sh deploy-db-bridge.sh %s;'%self.rootpassword, 'cd -'] - runCmd(awsApiCmds) + for f in ["cloudbridge_schema", "cloudbridge_multipart", "cloudbridge_index", "cloudbridge_multipart_alter", "cloudbridge_bucketpolicy", "cloudbridge_policy_alter", + "cloudbridge_offering", "cloudbridge_offering_alter"]: + if os.path.isfile(p): + p = os.path.join(awsApiDbDir,"%s.sql"%f) + if not os.path.exists(p): continue + text = file(p).read() + self.info("Applying %s"%p) + self.runMysql(text, p, True) + self.info(None, True) def prepareDBFiles(self): def prepareDBDotProperties(): From 3e0738e8b62a26c1900eec7e5d6981762e793d94 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Fri, 18 May 2012 15:57:23 -0700 Subject: [PATCH 2/4] CS-14979 fixed --- ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java b/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java index a3ec424a0ad..8232112ab5a 100755 --- a/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java +++ b/ovm/src/com/cloud/ovm/hypervisor/OvmResourceBase.java @@ -1024,7 +1024,7 @@ public class OvmResourceBase implements ServerResource, HypervisorResource { protected GetVncPortAnswer execute(GetVncPortCommand cmd) { try { Integer vncPort = OvmVm.getVncPort(_conn, cmd.getName()); - return new GetVncPortAnswer(cmd, vncPort); + return new GetVncPortAnswer(cmd, _ip, vncPort); } catch (Exception e) { s_logger.debug("get vnc port for " + cmd.getName() + " failed", e); return new GetVncPortAnswer(cmd, e.getMessage()); From 47f8b50f69eadf2e1b08e4b1990f48b315a60c5a Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 18 May 2012 17:03:47 -0700 Subject: [PATCH 3/4] CS-14949: cloudstack 3.0 UI - Instance page - hide Edit option when status is Running. --- ui/scripts/instances.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 6d1be3710a5..e7767f6442b 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -1716,8 +1716,7 @@ allowedActions.push("restore"); } } - else if (jsonObj.state == 'Running') { - allowedActions.push("edit"); + else if (jsonObj.state == 'Running') { allowedActions.push("stop"); allowedActions.push("restart"); allowedActions.push("destroy"); From 12d7b3fad27ec31ec4152a5d19e03e35c12b9408 Mon Sep 17 00:00:00 2001 From: Jessica Tomechak Date: Fri, 18 May 2012 17:13:05 -0700 Subject: [PATCH 4/4] CS-14949 Document workaround: need to stop VM before calling API. --- api/src/com/cloud/api/commands/UpdateVMCmd.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/com/cloud/api/commands/UpdateVMCmd.java b/api/src/com/cloud/api/commands/UpdateVMCmd.java index 7431ae96a42..2fcf224609a 100644 --- a/api/src/com/cloud/api/commands/UpdateVMCmd.java +++ b/api/src/com/cloud/api/commands/UpdateVMCmd.java @@ -25,7 +25,7 @@ import com.cloud.user.Account; import com.cloud.user.UserContext; import com.cloud.uservm.UserVm; -@Implementation(description="Updates parameters of a virtual machine.", responseObject=UserVmResponse.class) +@Implementation(description="Updates properties of a virtual machine. The VM has to be stopped and restarted for the new properties to take effect. UpdateVirtualMachine does not first check whether the VM is stopped. Therefore, stop the VM manually before issuing this call.", responseObject=UserVmResponse.class) public class UpdateVMCmd extends BaseCmd{ public static final Logger s_logger = Logger.getLogger(UpdateVMCmd.class.getName()); private static final String s_name = "updatevirtualmachineresponse";