Merge branch '4.8' into 4.9
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/55b91807 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/55b91807 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/55b91807 Branch: refs/heads/4.9 Commit: 55b918076fcce6c80bc1c09fa020f24c4278fe1e Parents: 1137a79 ff616e7 Author: Rohit Yadav <[email protected]> Authored: Wed Nov 23 13:50:15 2016 +0530 Committer: Rohit Yadav <[email protected]> Committed: Wed Nov 23 13:50:15 2016 +0530 ---------------------------------------------------------------------- .../resource/virtualnetwork/VRScripts.java | 5 ++++- .../virtualnetwork/VirtualRouterDeployer.java | 5 +++-- .../virtualnetwork/VirtualRoutingResource.java | 15 ++++++++------- .../VirtualRoutingResourceTest.java | 5 +++-- .../resource/HypervDirectConnectResource.java | 9 +++++---- .../kvm/resource/LibvirtComputingResource.java | 13 +++++++------ .../LibvirtOvsCreateTunnelCommandWrapper.java | 12 ++++-------- .../LibvirtPvlanSetupCommandWrapper.java | 5 +++-- .../resource/LibvirtComputingResourceTest.java | 20 +++++++++----------- .../resources/Ovm3VirtualRoutingResource.java | 8 +++++--- .../vmware/resource/VmwareResource.java | 8 +++++--- .../xenserver/resource/CitrixResourceBase.java | 8 +++++--- .../java/com/cloud/utils/script/Script.java | 18 +++++++++++++++++- .../java/com/cloud/utils/ssh/SshHelper.java | 9 +++++++-- 14 files changed, 85 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/55b91807/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --cc plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 2b9aa71,2b1cf68..7e2b1bf mode 100644,100755..100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@@ -191,7 -189,8 +192,7 @@@ public class LibvirtComputingResource e private String _clusterId; private long _hvVersion; - private int _timeout; - private long _kernelVersion; + private Duration _timeout; private static final int NUMMEMSTATS =2; private KVMHAMonitor _monitor; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/55b91807/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/55b91807/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/55b91807/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/55b91807/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java ---------------------------------------------------------------------- diff --cc utils/src/main/java/com/cloud/utils/ssh/SshHelper.java index 1f6d30c,8889016..a86a485 --- a/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java +++ b/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java @@@ -20,18 -20,13 +20,19 @@@ package com.cloud.utils.ssh; import java.io.File; +import java.io.IOException; import java.io.InputStream; +import java.nio.charset.StandardCharsets; + +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; + import org.joda.time.Duration; import com.trilead.ssh2.ChannelCondition; - +import com.trilead.ssh2.Connection; +import com.trilead.ssh2.Session; import com.cloud.utils.Pair; public class SshHelper {
