You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ek...@apache.org on 2015/05/13 11:35:47 UTC
[05/41] git commit: updated refs/heads/master to 45c0fa2
Refactoring the LibvirtComputingResource
- Adding LibvirtGetVmDiskStatsCommandWrapper
- 1 unit test
Added getConnection() to LibvirtConnectionWrapper
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/51093afc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/51093afc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/51093afc
Branch: refs/heads/master
Commit: 51093afcf11ef37b3d54c5430b955e87e17d2be2
Parents: 7086d64
Author: wilderrodrigues <wr...@schubergphilis.com>
Authored: Wed Apr 22 15:05:59 2015 +0200
Committer: wilderrodrigues <wr...@schubergphilis.com>
Committed: Wed May 6 19:20:40 2015 +0200
----------------------------------------------------------------------
.../kvm/resource/LibvirtComputingResource.java | 96 +-------------------
.../wrapper/LibvirtConnectionWrapper.java | 6 +-
.../LibvirtGetVmDiskStatsCommandWrapper.java | 62 +++++++++++++
.../resource/wrapper/LibvirtRequestWrapper.java | 2 +
.../resource/LibvirtComputingResourceTest.java | 37 ++++++++
5 files changed, 108 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51093afc/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 5969df3..82ea791 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
@@ -117,10 +117,6 @@ import com.cloud.agent.api.GetHostStatsAnswer;
import com.cloud.agent.api.GetHostStatsCommand;
import com.cloud.agent.api.GetStorageStatsAnswer;
import com.cloud.agent.api.GetStorageStatsCommand;
-import com.cloud.agent.api.GetVmDiskStatsAnswer;
-import com.cloud.agent.api.GetVmDiskStatsCommand;
-import com.cloud.agent.api.GetVmStatsAnswer;
-import com.cloud.agent.api.GetVmStatsCommand;
import com.cloud.agent.api.GetVncPortAnswer;
import com.cloud.agent.api.GetVncPortCommand;
import com.cloud.agent.api.HostStatsEntry;
@@ -169,8 +165,6 @@ import com.cloud.agent.api.StartCommand;
import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.StartupRoutingCommand;
import com.cloud.agent.api.StartupStorageCommand;
-import com.cloud.agent.api.StopAnswer;
-import com.cloud.agent.api.StopCommand;
import com.cloud.agent.api.UnPlugNicAnswer;
import com.cloud.agent.api.UnPlugNicCommand;
import com.cloud.agent.api.UpgradeSnapshotCommand;
@@ -1304,11 +1298,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
}
try {
- if (cmd instanceof GetVmStatsCommand) {
- return execute((GetVmStatsCommand)cmd);
- } else if (cmd instanceof GetVmDiskStatsCommand) {
- return execute((GetVmDiskStatsCommand)cmd);
- } else if (cmd instanceof RebootRouterCommand) {
+ if (cmd instanceof RebootRouterCommand) {
return execute((RebootRouterCommand)cmd);
} else if (cmd instanceof RebootCommand) {
return execute((RebootCommand)cmd);
@@ -3460,88 +3450,6 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
}
}
- protected GetVmDiskStatsAnswer execute(final GetVmDiskStatsCommand cmd) {
- final List<String> vmNames = cmd.getVmNames();
- try {
- final HashMap<String, List<VmDiskStatsEntry>> vmDiskStatsNameMap = new HashMap<String, List<VmDiskStatsEntry>>();
- final Connect conn = LibvirtConnection.getConnection();
- for (final String vmName : vmNames) {
- final List<VmDiskStatsEntry> statEntry = getVmDiskStat(conn, vmName);
- if (statEntry == null) {
- continue;
- }
-
- vmDiskStatsNameMap.put(vmName, statEntry);
- }
- return new GetVmDiskStatsAnswer(cmd, "", cmd.getHostName(), vmDiskStatsNameMap);
- } catch (final LibvirtException e) {
- s_logger.debug("Can't get vm disk stats: " + e.toString());
- return new GetVmDiskStatsAnswer(cmd, null, null, null);
- }
- }
-
- protected GetVmStatsAnswer execute(final GetVmStatsCommand cmd) {
- final List<String> vmNames = cmd.getVmNames();
- try {
- final HashMap<String, VmStatsEntry> vmStatsNameMap = new HashMap<String, VmStatsEntry>();
- for (final String vmName : vmNames) {
- final Connect conn = LibvirtConnection.getConnectionByVmName(vmName);
- final VmStatsEntry statEntry = getVmStat(conn, vmName);
- if (statEntry == null) {
- continue;
- }
-
- vmStatsNameMap.put(vmName, statEntry);
- }
- return new GetVmStatsAnswer(cmd, vmStatsNameMap);
- } catch (final LibvirtException e) {
- s_logger.debug("Can't get vm stats: " + e.toString());
- return new GetVmStatsAnswer(cmd, null);
- }
- }
-
- protected Answer execute(final StopCommand cmd) {
- final String vmName = cmd.getVmName();
-
- if (cmd.checkBeforeCleanup()) {
- try {
- final Connect conn = LibvirtConnection.getConnectionByVmName(vmName);
- final Domain vm = conn.domainLookupByName(cmd.getVmName());
- if (vm != null && vm.getInfo().state == DomainState.VIR_DOMAIN_RUNNING) {
- return new StopAnswer(cmd, "vm is still running on host", false);
- }
- } catch (final Exception e) {
- s_logger.debug("Failed to get vm status in case of checkboforecleanup is true", e);
- }
- }
-
- try {
- final Connect conn = LibvirtConnection.getConnectionByVmName(vmName);
-
- final List<DiskDef> disks = getDisks(conn, vmName);
- final List<InterfaceDef> ifaces = getInterfaces(conn, vmName);
-
- destroyNetworkRulesForVM(conn, vmName);
- final String result = stopVM(conn, vmName);
- if (result == null) {
- for (final DiskDef disk : disks) {
- cleanupDisk(disk);
- }
- for (final InterfaceDef iface : ifaces) {
- // We don't know which "traffic type" is associated with
- // each interface at this point, so inform all vif drivers
- for (final VifDriver vifDriver : getAllVifDrivers()) {
- vifDriver.unplug(iface);
- }
- }
- }
-
- return new StopAnswer(cmd, result, true);
- } catch (final LibvirtException e) {
- return new StopAnswer(cmd, e.getMessage(), false);
- }
- }
-
protected Answer execute(final ModifySshKeysCommand cmd) {
final File sshKeysDir = new File(SSHKEYSPATH);
String result = null;
@@ -4881,7 +4789,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
return command.execute();
}
- private List<VmDiskStatsEntry> getVmDiskStat(final Connect conn, final String vmName) throws LibvirtException {
+ public List<VmDiskStatsEntry> getVmDiskStat(final Connect conn, final String vmName) throws LibvirtException {
Domain dm = null;
try {
dm = getDomain(conn, vmName);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51093afc/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConnectionWrapper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConnectionWrapper.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConnectionWrapper.java
index 40643c1..0a6b966 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConnectionWrapper.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConnectionWrapper.java
@@ -22,7 +22,7 @@ import org.libvirt.LibvirtException;
import com.cloud.hypervisor.kvm.resource.LibvirtConnection;
/**
- * This class is used to wrapp the calls to LibvirtConnection and ease the burden of the unit tests.
+ * This class is used to wrap the calls to LibvirtConnection and ease the burden of the unit tests.
* Please do not instantiate this class directly, but inject it using the {@code @Inject} annotation.
*/
public class LibvirtConnectionWrapper {
@@ -30,4 +30,8 @@ public class LibvirtConnectionWrapper {
public Connect getConnectionByName(final String vmName) throws LibvirtException {
return LibvirtConnection.getConnectionByVmName(vmName);
}
+
+ public Connect getConnection() throws LibvirtException {
+ return LibvirtConnection.getConnection();
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51093afc/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmDiskStatsCommandWrapper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmDiskStatsCommandWrapper.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmDiskStatsCommandWrapper.java
new file mode 100644
index 0000000..32ff7df
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVmDiskStatsCommandWrapper.java
@@ -0,0 +1,62 @@
+//
+// 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
+// with 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 com.cloud.hypervisor.kvm.resource.wrapper;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.libvirt.Connect;
+import org.libvirt.LibvirtException;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.GetVmDiskStatsAnswer;
+import com.cloud.agent.api.GetVmDiskStatsCommand;
+import com.cloud.agent.api.VmDiskStatsEntry;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.resource.CommandWrapper;
+
+public final class LibvirtGetVmDiskStatsCommandWrapper extends CommandWrapper<GetVmDiskStatsCommand, Answer, LibvirtComputingResource> {
+
+ private static final Logger s_logger = Logger.getLogger(LibvirtGetVmDiskStatsCommandWrapper.class);
+
+ @Override
+ public Answer execute(final GetVmDiskStatsCommand command, final LibvirtComputingResource libvirtComputingResource) {
+ final List<String> vmNames = command.getVmNames();
+ final LibvirtConnectionWrapper libvirtConnectionWrapper = libvirtComputingResource.getLibvirtConnectionWrapper();
+
+ try {
+ final HashMap<String, List<VmDiskStatsEntry>> vmDiskStatsNameMap = new HashMap<String, List<VmDiskStatsEntry>>();
+ final Connect conn = libvirtConnectionWrapper.getConnection();
+ for (final String vmName : vmNames) {
+ final List<VmDiskStatsEntry> statEntry = libvirtComputingResource.getVmDiskStat(conn, vmName);
+ if (statEntry == null) {
+ continue;
+ }
+
+ vmDiskStatsNameMap.put(vmName, statEntry);
+ }
+ return new GetVmDiskStatsAnswer(command, "", command.getHostName(), vmDiskStatsNameMap);
+ } catch (final LibvirtException e) {
+ s_logger.debug("Can't get vm disk stats: " + e.toString());
+ return new GetVmDiskStatsAnswer(command, null, null, null);
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51093afc/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRequestWrapper.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRequestWrapper.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRequestWrapper.java
index 26dc305..c74a097 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRequestWrapper.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRequestWrapper.java
@@ -22,6 +22,7 @@ import java.util.Hashtable;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;
+import com.cloud.agent.api.GetVmDiskStatsCommand;
import com.cloud.agent.api.GetVmStatsCommand;
import com.cloud.agent.api.StopCommand;
import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
@@ -48,6 +49,7 @@ public class LibvirtRequestWrapper extends RequestWrapper {
linbvirtCommands.put(StopCommand.class, new LibvirtStopCommandWrapper());
linbvirtCommands.put(GetVmStatsCommand.class, new LibvirtGetVmStatsCommandWrapper());
+ linbvirtCommands.put(GetVmDiskStatsCommand.class, new LibvirtGetVmDiskStatsCommandWrapper());
resources.put(LibvirtComputingResource.class, linbvirtCommands);
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51093afc/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
index 0d8c3f5..cd12556 100644
--- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
+++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
@@ -61,6 +61,7 @@ import org.w3c.dom.Document;
import org.xml.sax.SAXException;
import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.GetVmDiskStatsCommand;
import com.cloud.agent.api.GetVmStatsCommand;
import com.cloud.agent.api.StopCommand;
import com.cloud.agent.api.VmStatsEntry;
@@ -491,4 +492,40 @@ public class LibvirtComputingResourceTest {
fail(e.getMessage());
}
}
+
+ @Test
+ public void testGetVmDiskStatsCommand() {
+ // We cannot do much here due to the Native libraries and Static methods used by the LibvirtConnection we need
+ // a better way to mock stuff!
+
+ final Connect conn = Mockito.mock(Connect.class);
+ final LibvirtConnectionWrapper libvirtConnectionWrapper = Mockito.mock(LibvirtConnectionWrapper.class);
+
+ final String vmName = "Test";
+ final String uuid = "e8d6b4d0-bc6d-4613-b8bb-cb9e0600f3c6";
+ final List<String> vms = new ArrayList<String>();
+ vms.add(vmName);
+
+ final GetVmDiskStatsCommand stopCommand = new GetVmDiskStatsCommand(vms, uuid, "hostname");
+
+ when(libvirtComputingResource.getLibvirtConnectionWrapper()).thenReturn(libvirtConnectionWrapper);
+ try {
+ when(libvirtConnectionWrapper.getConnection()).thenReturn(conn);
+ } catch (final LibvirtException e) {
+ fail(e.getMessage());
+ }
+
+ final LibvirtRequestWrapper wrapper = LibvirtRequestWrapper.getInstance();
+ assertNotNull(wrapper);
+
+ final Answer answer = wrapper.execute(stopCommand, libvirtComputingResource);
+ assertTrue(answer.getResult());
+
+ verify(libvirtComputingResource, times(1)).getLibvirtConnectionWrapper();
+ try {
+ verify(libvirtConnectionWrapper, times(1)).getConnection();
+ } catch (final LibvirtException e) {
+ fail(e.getMessage());
+ }
+ }
}
\ No newline at end of file