Merge code from Whei Zou and use libvirt-java for the commands

Author: wido

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

@@ -44,6 +44,9 @@
 import javax.ejb.Local;
 import javax.naming.ConfigurationException;
 
+import org.apache.cloudstack.api.guestagent.GuestAgentAnswer;
+import org.apache.cloudstack.api.guestagent.GuestAgentAnswer.GuestAgentIntegerAnswer;
+import org.apache.cloudstack.api.guestagent.GuestAgentCommand;
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
 import org.apache.cloudstack.utils.hypervisor.HypervisorUtils;
@@ -142,6 +145,8 @@
 import com.cloud.utils.ssh.SshHelper;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachine.PowerState;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 
 /**
  * LibvirtComputingResource execute requests on the computing/routing host using
@@ -3411,4 +3416,50 @@ public String mapRbdDevice(final KVMPhysicalDisk disk){
         }
         return device;
     }
+
+    public <A extends GuestAgentAnswer> A SendToVMAgent(Connect conn, String vmName, GuestAgentCommand cmd, Class<?> answerClass, Integer timeout) {
+        Domain dm = null;
+        Gson gson = new GsonBuilder().create();
+        try {
+            dm = conn.domainLookupByName(vmName);
+            String result = dm.qemuAgentCommand(gson.toJson(cmd), timeout, 0);
+            return (A) gson.fromJson(result, answerClass);
+        } catch (LibvirtException e) {
+            s_logger.warn("Failed to send Qemu Guest command to Instance " + vmName + " due to: " + e.getMessage());
+        } finally {
+            try {
+                if (dm != null) {
+                    dm.free();
+                }
+            } catch (LibvirtException l) {
+                s_logger.trace("Ignoring libvirt error.", l);
+            }
+        }
+        return null;
+    }
+
+    public boolean checkGuestAgentSync(Connect conn, String vmName) {
+        HashMap arguments = new HashMap();
+        int id = (int)(Math.random() * 1000000) + 1;
+        arguments.put("id", id);
+        GuestAgentCommand cmd = new GuestAgentCommand("guest-sync", arguments);
+        GuestAgentIntegerAnswer answer = null;
+        try {
+            answer = (GuestAgentIntegerAnswer) SendToVMAgent(conn, vmName, cmd, GuestAgentIntegerAnswer.class, 5);
+        } catch (Exception e) {
+            s_logger.warn("Failed to send guest-sync command to guest agent: " + e.getMessage());
+            return false;
+        }
+
+        if (answer == null) {
+            s_logger.warn("Answer from guest agent in " + vmName + " is null");
+            return false;
+        } else if (answer.getAnswer() != id) {
+            s_logger.warn("Answer from guest agent in " + vmName + " is different from input value");
+            return false;
+        } else {
+            s_logger.debug("id = " + id + ", answer from guest agent: " + answer.getAnswer());
+            return true;
+        }
+    }
 }

plugins/hypervisors/kvm/src/org/apache/cloudstack/api/guestagent/GuestAgentAnswer.java

@@ -0,0 +1,24 @@
+package org.apache.cloudstack.api.guestagent;
+
+import com.google.gson.annotations.SerializedName;
+
+public class GuestAgentAnswer {
+
+    public static class GuestAgentIntegerAnswer extends GuestAgentAnswer {
+        @SerializedName("return")
+        int answer;
+
+        public int getAnswer() {
+            return answer;
+        }
+    }
+
+    public static class GuestAgentStringAnswer extends GuestAgentAnswer {
+        @SerializedName("return")
+        String answer;
+
+        public String getAnswer() {
+            return answer;
+        }
+    }
+}

plugins/hypervisors/kvm/src/org/apache/cloudstack/api/guestagent/GuestAgentCommand.java

@@ -0,0 +1,24 @@
+package org.apache.cloudstack.api.guestagent;
+
+import java.util.HashMap;
+
+public class GuestAgentCommand {
+    String execute;
+    @SuppressWarnings("rawtypes")
+    HashMap arguments;
+
+    @SuppressWarnings("rawtypes")
+    public GuestAgentCommand(String execute, HashMap arguments) {
+        this.execute = execute;
+        this.arguments = arguments;
+    }
+
+    public String getCommand() {
+        return execute;
+    }
+
+    @SuppressWarnings("rawtypes")
+    public HashMap getArguments() {
+        return arguments;
+    }
+}

plugins/hypervisors/kvm/test/org/apache/cloudstack/api/guestagent/GuestAgentCommandTest.java

@@ -0,0 +1,50 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// the License.  You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.guestagent;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.HashMap;
+
+import org.junit.Test;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+public class GuestAgentCommandTest {
+
+    @Test
+    public void testWithoutArgument() {
+        String command = "guest-sync";
+        Gson gson = new GsonBuilder().create();
+        GuestAgentCommand cmd = new GuestAgentCommand(command, null);
+        String data = gson.toJson(cmd);
+        assertEquals("{\"execute\":\"" + command + "\"}", data);
+    }
+
+    @Test
+    public void testWithArgument() {
+        HashMap arguments = new HashMap();
+        int id = (int)(Math.random() * 1000000) + 1;
+        arguments.put("id", id);
+        String command = "guest-sync";
+        Gson gson = new GsonBuilder().create();
+        GuestAgentCommand cmd = new GuestAgentCommand(command, arguments);
+        String data = gson.toJson(cmd);
+        assertEquals("{\"execute\":\"" + command + "\",\"arguments\":{\"id\":" + id + "}}", data);
+    }
+}