Updated Branches: refs/heads/master fc6c1ec81 -> c10ee5dde
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 <[email protected]> 1381965250 -0700 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c10ee5dd Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c10ee5dd Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c10ee5dd Branch: refs/heads/master Commit: c10ee5dde48ac7daf8f7ed6ba633776c184081ae Parents: fc6c1ec Author: John Kinsella <[email protected]> Authored: Wed Oct 16 16:14:10 2013 -0700 Committer: John Kinsella <[email protected]> Committed: Wed Oct 16 16:14:10 2013 -0700 ---------------------------------------------------------------------- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c10ee5dd/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 cddfac9..371c4e0 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; } }
