etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-3959: [KVM] agent setup failed when physical interface name is in pXpY format 

Add handling.

Signed-off-by: Edison Su <sudison@gmail.com>
This commit is contained in:
Toshiaki Hatano 2013-07-30 22:03:32 +00:00 committed by Edison Su
parent 211524f3bc
commit 7774ecfd5a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1000,7 +1000,7 @@ ServerResource {
File f = new File("/sys/devices/virtual/net/" + bridgeName + "/brif");
if (! f.isDirectory()){
s_logger.debug("failing to get physical interface from bridge"
s_logger.debug("failing to get physical interface from bridge "
+ bridgeName + ", does " + f.getAbsolutePath()
+ "exist?");
return "";
@ -1012,13 +1012,14 @@ ServerResource {
String fname = interfaces[i].getName();
s_logger.debug("matchPifFileInDirectory: file name '"+fname+"'");
if (fname.startsWith("eth") || fname.startsWith("bond")
|| fname.startsWith("vlan") || fname.startsWith("em")) {
|| fname.startsWith("vlan") || 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*, or vlan* in "
s_logger.debug("failing to get physical interface from bridge "
+ bridgeName + ", did not find an eth*, bond*, vlan*, em*, or p*p* in "
+ f.getAbsolutePath());
return "";
}