Do not consider watchdogs for aarch64 as its not supported

Author: nvazquez

agent/src/main/java/com/cloud/agent/properties/AgentProperties.java

@@ -516,6 +516,7 @@ public class AgentProperties{
     /**
      * The model of Watchdog timer to present to the Guest.<br>
      * For all models refer to the libvirt documentation.<br>
+     * PLEASE NOTE: this value will be ignored in case arch is aarch64
      * Data type: String.<br>
      * Default value: <code>i6300esb</code>
      */
@@ -524,6 +525,7 @@ public class AgentProperties{
     /**
      * Action to take when the Guest/Instance is no longer notifying the Watchdog timer.<br>
      * Possible values: none | reset | poweroff <br>
+     * PLEASE NOTE: this value will be ignored in case arch is aarch64
      * Data type: String.<br>
      * Default value: <code>none</code>
      */

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

@@ -2667,7 +2667,7 @@ protected DevicesDef createDevicesDef(VirtualMachineTO vmTO, GuestDef guest, int
     }
 
     protected WatchDogDef createWatchDogDef() {
-        return new WatchDogDef(watchDogAction, watchDogModel);
+        return new WatchDogDef(watchDogAction, watchDogModel, guestCpuArch);
     }
 
     protected void createArm64UsbDef(DevicesDef devices) {

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

@@ -78,6 +78,13 @@ public boolean parseDomainXML(String domXML) {
             desc = getTagValue("description", rootElement);
             name = getTagValue("name", rootElement);
 
+            String arch = null;
+            NodeList nodeType = rootElement.getElementsByTagName("type");
+            if (nodeType.getLength() > 0) {
+                Element item = (Element) nodeType.item(0);
+                arch = item.getAttribute("arch");
+            }
+
             Element devices = (Element)rootElement.getElementsByTagName("devices").item(0);
             NodeList disks = devices.getElementsByTagName("disk");
             for (int i = 0; i < disks.getLength(); i++) {
@@ -379,10 +386,11 @@ public boolean parseDomainXML(String domXML) {
                 }
 
                 if (StringUtils.isEmpty(action)) {
-                    def = new WatchDogDef(WatchDogModel.valueOf(model.toUpperCase()));
+                    def = new WatchDogDef(WatchDogModel.valueOf(model.toUpperCase()), arch);
                 } else {
                     def = new WatchDogDef(WatchDogAction.valueOf(action.toUpperCase()),
-                                          WatchDogModel.valueOf(model.toUpperCase()));
+                                          WatchDogModel.valueOf(model.toUpperCase()),
+                                          arch);
                 }
 
                 watchDogDefs.add(def);

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

@@ -2323,17 +2323,22 @@ public String toString() {
         WatchDogModel model = WatchDogModel.I6300ESB;
         WatchDogAction action = WatchDogAction.NONE;
 
-        public WatchDogDef(WatchDogAction action) {
+        String arch;
+
+        public WatchDogDef(WatchDogAction action, String arch) {
             this.action = action;
+            this.arch = arch;
         }
 
-        public WatchDogDef(WatchDogModel model) {
+        public WatchDogDef(WatchDogModel model, String arch) {
             this.model = model;
+            this.arch = arch;
         }
 
-        public WatchDogDef(WatchDogAction action, WatchDogModel model) {
+        public WatchDogDef(WatchDogAction action, WatchDogModel model, String arch) {
             this.action = action;
             this.model = model;
+            this.arch = arch;
         }
 
         public WatchDogAction getAction() {
@@ -2346,6 +2351,9 @@ public WatchDogModel getModel() {
 
         @Override
         public String toString() {
+            if (StringUtils.isNotBlank(arch) && "aarch64".equalsIgnoreCase(arch)) {
+                return "";
+            }
             StringBuilder wacthDogBuilder = new StringBuilder();
             wacthDogBuilder.append("<watchdog model='" + model + "' action='" + action + "'/>\n");
             return wacthDogBuilder.toString();

plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDefTest.java

@@ -31,6 +31,8 @@
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.MemBalloonDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.SCSIDef;
 import org.apache.cloudstack.utils.qemu.QemuObject;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
@@ -532,11 +534,21 @@ public void testWatchDogDef() {
         LibvirtVMDef.WatchDogDef.WatchDogModel model = LibvirtVMDef.WatchDogDef.WatchDogModel.I6300ESB;
         LibvirtVMDef.WatchDogDef.WatchDogAction action = LibvirtVMDef.WatchDogDef.WatchDogAction.RESET;
 
-        LibvirtVMDef.WatchDogDef def = new LibvirtVMDef.WatchDogDef(action, model);
+        LibvirtVMDef.WatchDogDef def = new LibvirtVMDef.WatchDogDef(action, model, null);
         assertEquals(model, def.getModel());
         assertEquals(action, def.getAction());
     }
 
+    @Test
+    public void testWatchDofDefAarch64() {
+        LibvirtVMDef.WatchDogDef.WatchDogModel model = LibvirtVMDef.WatchDogDef.WatchDogModel.I6300ESB;
+        LibvirtVMDef.WatchDogDef.WatchDogAction action = LibvirtVMDef.WatchDogDef.WatchDogAction.RESET;
+        LibvirtVMDef.WatchDogDef def = new LibvirtVMDef.WatchDogDef(action, model, "aarch64");
+        String result = def.toString();
+        Assert.assertNotNull(result);
+        Assert.assertTrue(StringUtils.isBlank(result));
+    }
+
     @Test
     public void testSCSIDef() {
         SCSIDef def = new SCSIDef((short)0, 0, 0, 9, 0, 4);