From c10ee5dde48ac7daf8f7ed6ba633776c184081ae Mon Sep 17 00:00:00 2001 From: John Kinsella Date: Wed, 16 Oct 2013 16:14:10 -0700 Subject: [PATCH] Summary: Updated Ethernet regex for vlan-tagged "p1p1.2" style interfaces Detail: Checks for other Ethernet interface names uses startsWith(), whereas the p1p1 style interface uses a regex that doesn't allow for tailing characters, and so blocks vlan IDs. Fixed. BUG-ID: CLOUDSTACK-4884 Bugfix-for: 4.2.1 Reviewed-by: Reported-by: Signed-off-by: John Kinsella 1381965250 -0700 --- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cddfac9a7a7..371c4e0a417 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 @@ -1040,7 +1040,7 @@ ServerResource { s_logger.debug("matchPifFileInDirectory: file name '"+fname+"'"); if (fname.startsWith("eth") || fname.startsWith("bond") || fname.startsWith("vlan") || fname.startsWith("em") - || fname.matches("^p\\d+p\\d+")) { + || fname.matches("^p\\d+p\\d+.*")) { return fname; } }