You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/27 19:45:14 UTC
[1/2] git commit: updated refs/heads/master to 3358d65
Repository: cloudstack
Updated Branches:
refs/heads/master 5c801a1d2 -> 3358d6509
CLOUDSTACK-9037 patterns can be more elaborate then prefixes.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/08eb9677
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/08eb9677
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/08eb9677
Branch: refs/heads/master
Commit: 08eb96776a7714a40bab447f31862ab68f5729d7
Parents: 36d0bfd
Author: Daan Hoogland <da...@onecht.net>
Authored: Mon Nov 23 11:45:48 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Nov 23 11:48:44 2015 +0100
----------------------------------------------------------------------
.../kvm/resource/LibvirtComputingResource.java | 28 ++++++++++----------
.../resource/LibvirtComputingResourceTest.java | 7 ++---
2 files changed, 18 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08eb9677/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 6560a38..45286ee 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
@@ -1170,17 +1170,17 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
return "";
}
- String [] _ifNamePrefixes = {
- "eth",
- "bond",
- "vlan",
- "vx",
- "em",
- "ens",
- "eno",
- "enp",
- "team",
- "enx",
+ String [] _ifNamePatterns = {
+ "^eth",
+ "^bond",
+ "^vlan",
+ "^vx",
+ "^em",
+ "^ens",
+ "^eno",
+ "^enp",
+ "^team",
+ "^enx",
"^p\\d+p\\d+"
};
/**
@@ -1188,9 +1188,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
* @return
*/
boolean isInterface(final String fname) {
- final StringBuffer commonPattern = new StringBuffer();
- for (final String ifNamePrefix : _ifNamePrefixes) {
- commonPattern.append("|(").append(ifNamePrefix).append(".*)");
+ StringBuffer commonPattern = new StringBuffer();
+ for (final String ifNamePattern : _ifNamePatterns) {
+ commonPattern.append("|(").append(ifNamePattern).append(".*)");
}
if(fname.matches(commonPattern.toString())) {
return true;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08eb9677/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 b15e148..50a669f 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
@@ -5005,10 +5005,11 @@ public class LibvirtComputingResourceTest {
LibvirtComputingResource lvcr = new LibvirtComputingResource();
assertFalse(lvcr.isInterface("bla"));
assertTrue(lvcr.isInterface("p99p00"));
- for (String ifNamePrefix : lvcr._ifNamePrefixes) {
+ for (String ifNamePattern : lvcr._ifNamePatterns) {
// excluding regexps as "\\\\d+" won't replace with String.replaceAll(String,String);
- if (!ifNamePrefix.contains("\\")) {
- assertTrue(lvcr.isInterface(ifNamePrefix + "0"));
+ if (!ifNamePattern.contains("\\")) {
+ String ifName = ifNamePattern.replaceFirst("\\^", "") + "0";
+ assertTrue("The pattern '" + ifNamePattern + "' is expected to be valid for interface " + ifName,lvcr.isInterface(ifName));
}
}
}
[2/2] git commit: updated refs/heads/master to 3358d65
Posted by re...@apache.org.
Merge pull request #1035 from DaanHoogland/CLOUDSTACK-9037
CLOUDSTACK-9037 patterns can be more elaborate then prefixes.little fix to make sure for instance "eth" is not regarded as interface when it is part of "methamfetamine"
* pr/1035:
CLOUDSTACK-9037 patterns can be more elaborate then prefixes.
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3358d650
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3358d650
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3358d650
Branch: refs/heads/master
Commit: 3358d6509bc107bec64a58a024621cde8ee61e0b
Parents: 5c801a1 08eb967
Author: Remi Bergsma <gi...@remi.nl>
Authored: Fri Nov 27 19:44:35 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Fri Nov 27 19:44:35 2015 +0100
----------------------------------------------------------------------
.../kvm/resource/LibvirtComputingResource.java | 28 ++++++++++----------
.../resource/LibvirtComputingResourceTest.java | 7 ++---
2 files changed, 18 insertions(+), 17 deletions(-)
----------------------------------------------------------------------