diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHABase.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHABase.java
index f30e2c779195..dffa70c28632 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHABase.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHABase.java
@@ -16,7 +16,6 @@
// under the License.
package com.cloud.hypervisor.kvm.resource;
-import java.io.File;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
@@ -64,34 +63,18 @@ public String getPoolUUID() {
return poolUuid;
}
- public void setPoolUUID(String poolUuid) {
- this.poolUuid = poolUuid;
- }
-
public String getPoolIp() {
return poolIp;
}
- public void setPoolIp(String poolIp) {
- this.poolIp = poolIp;
- }
-
public String getPoolMountSourcePath() {
return poolMountSourcePath;
}
- public void setPoolMountSourcePath(String poolMountSourcePath) {
- this.poolMountSourcePath = poolMountSourcePath;
- }
-
public String getMountDestPath() {
return mountDestPath;
}
- public void setMountDestPath(String mountDestPath) {
- this.mountDestPath = mountDestPath;
- }
-
public PoolType getType() {
return poolType;
}
@@ -202,35 +185,6 @@ protected void destroyVMs(String mountPath) {
}
}
- protected String getHBFile(String mountPoint, String hostIP) {
- return mountPoint + File.separator + "KVMHA" + File.separator + "hb-" + hostIP;
- }
-
- protected String getHBFolder(String mountPoint) {
- return mountPoint + File.separator + "KVMHA" + File.separator;
- }
-
- protected String runScriptRetry(String cmdString, OutputInterpreter interpreter) {
- String result = null;
- for (int i = 0; i < 3; i++) {
- Script cmd = new Script("/bin/bash", _timeout);
- cmd.add("-c");
- cmd.add(cmdString);
- if (interpreter != null)
- result = cmd.execute(interpreter);
- else {
- result = cmd.execute();
- }
- if (result == Script.ERR_TIMEOUT) {
- continue;
- } else if (result == null) {
- break;
- }
- }
-
- return result;
- }
-
public Boolean hasHeartBeat() {
// TODO Auto-generated method stub
return null;
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 9009ec629ca3..f8bbd2595ea5 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -33,7 +33,6 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.StringReader;
-import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.URI;
import java.net.URISyntaxException;
@@ -256,7 +255,6 @@
import com.cloud.vm.VirtualMachine.PowerState;
import com.cloud.vm.VmDetailConstants;
-import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
@@ -440,7 +438,6 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
private String setupTungstenVrouterPath;
private String updateTungstenLoadbalancerStatsPath;
private String updateTungstenLoadbalancerSslPath;
- private String host;
private String dcId;
private String clusterId;
@@ -600,7 +597,6 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
private boolean isReconcileCommandsEnabled = false;
- private static Gson gson = new Gson();
/**
* Virsh command to set the memory balloon stats period.
@@ -2325,19 +2321,6 @@ protected Long getJsonLongValueOrNull(JsonObject jsonObject, String fieldName) {
return element.getAsLong();
}
- boolean isDirectAttachedNetwork(final String type) {
- if ("untagged".equalsIgnoreCase(type)) {
- return true;
- } else {
- try {
- Long.valueOf(type);
- } catch (final NumberFormatException e) {
- return true;
- }
- return false;
- }
- }
-
public String startVM(final Connect conn, final String vmName, final String domainXML) throws LibvirtException, InternalErrorException {
return startVM(conn, vmName, domainXML, 0);
}
@@ -2761,7 +2744,6 @@ protected ExecutionResult prepareNetworkElementCommand(final IpAssocVpcCommand c
conn = getLibvirtUtilitiesHelper().getConnectionByVmName(routerName);
Pair