kvm: remove unused methods from storage and utility classes

Each of these has no caller anywhere in the tree, tests included:

  LibvirtSecretDef: getEphemeral, getVolumeVolume, getCephName
  LibvirtStorageVolumeXMLParser: getBackingFileNameIfExists
  LibvirtStorageAdaptor: storagePoolRefresh
  KVMStorageProcessor: getDefaultStorageScriptsDir
  LibvirtMigrateCommandWrapper: hasClvmDestinationDisks
  MultipathSCSIAdapterBase / FiberChannelAdapter: isStoragePoolTypeSupported
  QemuImg: supportsSkipZeros
  KVMHostInfo: getTotalCpus

Author: wido

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtSecretDef.java

@@ -51,10 +51,6 @@ public LibvirtSecretDef(Usage usage, String uuid, String description) {
         _description = description;
     }
 
-    public boolean getEphemeral() {
-        return _ephemeral;
-    }
-
     public void setEphemeral(boolean ephemeral) { _ephemeral = ephemeral; }
 
     public boolean getPrivate() {
@@ -71,14 +67,6 @@ public String getDescription() {
         return _description;
     }
 
-    public String getVolumeVolume() {
-        return _volumeVolume;
-    }
-
-    public String getCephName() {
-        return _cephName;
-    }
-
     public void setVolumeVolume(String volume) {
         _volumeVolume = volume;
     }

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtStorageVolumeXMLParser.java

@@ -61,26 +61,6 @@ public LibvirtStorageVolumeDef parseStorageVolumeXML(String volXML) {
         return null;
     }
 
-    public String getBackingFileNameIfExists(String volXML) {
-        try {
-            DocumentBuilder builder = ParserUtils.getSaferDocumentBuilderFactory().newDocumentBuilder();
-
-            InputSource is = new InputSource();
-            is.setCharacterStream(new StringReader(volXML));
-            Document doc = builder.parse(is);
-
-            Element rootElement = doc.getDocumentElement();
-            Element backingStore = (Element)rootElement.getElementsByTagName("backingStore").item(0);
-            if (backingStore != null) {
-                String[] paths = getTagValue("path", backingStore).split("/");
-                return paths[paths.length-1];
-            }
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            logger.error(e.toString(), e);
-        }
-        return null;
-    }
-
     private static String getTagValue(String tag, Element eElement) {
         NodeList nlList = eElement.getElementsByTagName(tag).item(0).getChildNodes();
         Node nValue = nlList.item(0);

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java

@@ -1082,34 +1082,6 @@ public static String maskSensitiveInfoInXML(String xmlDesc) {
                 "$1*****$3");
     }
 
-    /**
-     * Checks if any of the destination disks in the migration target a CLVM or CLVM_NG storage pool.
-     * This is used to determine if incremental migration should be disabled to avoid libvirt
-     * precreate errors with QCOW2-on-LVM setups.
-     *
-     * @param mapMigrateStorage the map containing migration disk information with destination pool types
-     * @return true if any destination disk targets CLVM or CLVM_NG, false otherwise
-     */
-    protected boolean hasClvmDestinationDisks(Map<String, MigrateCommand.MigrateDiskInfo> mapMigrateStorage) {
-        if (MapUtils.isEmpty(mapMigrateStorage)) {
-            return false;
-        }
-
-        try {
-            for (Map.Entry<String, MigrateCommand.MigrateDiskInfo> entry : mapMigrateStorage.entrySet()) {
-                MigrateCommand.MigrateDiskInfo diskInfo = entry.getValue();
-               if (isClvmBlockDevice(diskInfo)) {
-                    logger.debug("Found disk targeting CLVM/CLVM_NG destination pool");
-                    return true;
-               }
-            }
-        } catch (final Exception e) {
-            logger.debug("Failed to check for CLVM destination disks: {}. Assuming no CLVM disks.", e.getMessage());
-        }
-
-        return false;
-    }
-
     private boolean isClvmBlockDevice(MigrateCommand.MigrateDiskInfo diskInfo) {
         if (diskInfo == null ||diskInfo.getDestPoolType() == null) {
             return false;

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/FiberChannelAdapter.java

@@ -69,13 +69,6 @@ public String getName() {
         return "FiberChannelAdapter";
     }
 
-    public boolean isStoragePoolTypeSupported(Storage.StoragePoolType type) {
-        if (Storage.StoragePoolType.FiberChannel.equals(type)) {
-            return true;
-        }
-        return false;
-    }
-
     @Override
     public AddressInfo parseAndValidatePath(String inPath) {
             // type=FIBERWWN; address=<address>; connid=<connid>

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java

@@ -262,10 +262,6 @@ public KVMStorageProcessor(final KVMStoragePoolManager storagePoolMgr, final Lib
         this.resource = resource;
     }
 
-    protected String getDefaultStorageScriptsDir() {
-        return "scripts/storage/qcow2";
-    }
-
     public boolean configure(final String name, final Map<String, Object> params) throws ConfigurationException {
         storageLayer = new JavaStorageLayer();
         storageLayer.configure("StorageLayer", params);

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java

@@ -282,16 +282,6 @@ public StorageVol createVolume(Connect conn, StoragePool pool, String uuid, long
         return pool.storageVolCreateXML(volDef.toString(), 0);
     }
 
-    public void storagePoolRefresh(StoragePool pool) {
-        try {
-            synchronized (getStoragePool(pool.getUUIDString())) {
-                refreshPool(pool);
-            }
-        } catch (LibvirtException e) {
-            logger.debug("refresh storage pool failed: " + e.toString());
-        }
-    }
-
     private void checkNetfsStoragePoolMounted(String uuid) {
         String targetPath = _mountPoint + File.separator + uuid;
         int mountpointResult = Script.runSimpleBashScriptForExitValue("mountpoint -q " + targetPath);

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/MultipathSCSIAdapterBase.java

@@ -139,8 +139,6 @@ public KVMStoragePool getStoragePool(String uuid, boolean refreshInfo) {
 
     public abstract String getName();
 
-    public abstract boolean isStoragePoolTypeSupported(Storage.StoragePoolType type);
-
     public abstract AddressInfo parseAndValidatePath(String path);
 
     @Override

plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/KVMHostInfo.java

@@ -74,10 +74,6 @@ public KVMHostInfo(long reservedMemory, long overCommitMemory, long manualSpeed,
         }
     }
 
-    public int getTotalCpus() {
-        return this.totalCpus;
-    }
-
     public int getAllocatableCpus() {
         return this.allocatableCpus;
     }

plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImg.java

@@ -999,14 +999,6 @@ protected Script createScript(String path, long timeout) {
         return new Script(path, timeout);
     }
 
-    /**
-     * Does qemu-img support --target-is-zero
-     * @return boolean
-     */
-    public boolean supportsSkipZeros() {
-        return this.skipZero;
-    }
-
     public void setSkipZero(boolean skipZero) {
         this.skipZero = skipZero;
     }