cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [2/6] git commit: updated refs/heads/master to b69dff7
Date Sun, 25 Oct 2015 20:03:42 GMT
Added support for KVM teamd devices to LibvirtComputingResource.java.  This will allow users
to utilze teamd nic teaming devices named team*.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e1a401c0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e1a401c0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e1a401c0

Branch: refs/heads/master
Commit: e1a401c0232928109330cc4670e54b6a80a97de4
Parents: cf839bd
Author: David Mabry <dmabry@ena.com>
Authored: Thu Oct 22 10:19:50 2015 -0500
Committer: David Mabry <dmabry@ena.com>
Committed: Thu Oct 22 10:19:50 2015 -0500

----------------------------------------------------------------------
 .../hypervisor/kvm/resource/LibvirtComputingResource.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e1a401c0/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 bc57c2c..db4b9e8 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1160,13 +1160,13 @@ public class LibvirtComputingResource extends ServerResourceBase implements
Serv
         for (int i = 0; i < interfaces.length; i++) {
             final String fname = interfaces[i].getName();
             s_logger.debug("matchPifFileInDirectory: file name '" + fname + "'");
-            if (fname.startsWith("eth") || fname.startsWith("bond") || fname.startsWith("vlan")
|| fname.startsWith("vx") || fname.startsWith("em") ||
+            if (fname.startsWith("eth") || fname.startsWith("bond") || fname.startsWith("team")
|| fname.startsWith("vlan") || fname.startsWith("vx") || fname.startsWith("em") ||
                     fname.matches("^p\\d+p\\d+.*")) {
                 return fname;
             }
         }
 
-        s_logger.debug("failing to get physical interface from bridge " + bridgeName + ",
did not find an eth*, bond*, vlan*, em*, or p*p* in " + brif.getAbsolutePath());
+        s_logger.debug("failing to get physical interface from bridge " + bridgeName + ",
did not find an eth*, bond*, team*, vlan*, em*, or p*p* in " + brif.getAbsolutePath());
         return "";
     }
 
@@ -1450,7 +1450,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements
Serv
                 if (!matcher.group(4).isEmpty()) {
                     return BroadcastDomainType.Vlan.toUri(matcher.group(4)).toString();
                 } else {
-                    //untagged or not matching (eth|bond)#.#
+                    //untagged or not matching (eth|bond|team)#.#
                     s_logger.debug("failed to get vNet id from bridge " + brName
                             + "attached to physical interface" + pif + ", perhaps untagged
interface");
                     return "";


Mime
View raw message