agent: Rename startDomain to startVM The other methods are called stopVM and rebootVM, so it makes sence to use startVM.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a5f0be18 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a5f0be18 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a5f0be18 Branch: refs/heads/ui-plugins Commit: a5f0be186f8d18f97d9114292cd56b4b2e5880d0 Parents: 5dfcd30 Author: Wido den Hollander <[email protected]> Authored: Thu Feb 7 23:02:03 2013 +0100 Committer: Wido den Hollander <[email protected]> Committed: Thu Feb 7 23:07:10 2013 +0100 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5f0be18/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 49d2f0b..552afb1 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -975,7 +975,7 @@ ServerResource { } } - protected String startDomain(Connect conn, String vmName, String domainXML) + protected String startVM(Connect conn, String vmName, String domainXML) throws LibvirtException, InternalErrorException { Domain dm = null; try { @@ -3006,7 +3006,7 @@ ServerResource { createVifs(vmSpec, vm); s_logger.debug("starting " + vmName + ": " + vm.toString()); - startDomain(conn, vmName, vm.toString()); + startVM(conn, vmName, vm.toString()); NicTO[] nics = vmSpec.getNics(); for (NicTO nic : nics) { @@ -3832,7 +3832,7 @@ ServerResource { String vmDef = dm.getXMLDesc(0); s_logger.debug(vmDef); msg = stopVM(conn, vmName); - msg = startDomain(conn, vmName, vmDef); + msg = startVM(conn, vmName, vmDef); return null; } catch (LibvirtException e) { s_logger.warn("Failed to create vm", e);
