You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/08/26 10:50:59 UTC
[1/2] git commit: updated refs/heads/4.5 to acf1baf
Repository: cloudstack
Updated Branches:
refs/heads/4.5 3d9cbf0bc -> acf1baf1a
CLOUDSTACK-8749: Add checks to prevent malformed/unexpected input
Based on @jburwell's comment on PR #718
This closes #733
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2a382e00
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2a382e00
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2a382e00
Branch: refs/heads/4.5
Commit: 2a382e000b55dc6bef065241886f316348dc979e
Parents: 0b4f972
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Aug 24 14:46:09 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Aug 26 13:36:22 2015 +0530
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/BridgeVifDriver.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2a382e00/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
index dbc079d..2fab9a8 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
@@ -26,6 +26,7 @@ import java.util.regex.Pattern;
import javax.naming.ConfigurationException;
+import com.google.common.base.Strings;
import org.apache.log4j.Logger;
import org.libvirt.LibvirtException;
@@ -275,7 +276,7 @@ public class BridgeVifDriver extends VifDriverBase {
createControlNetwork(_bridges.get("linklocal"));
}
- private void deleteExitingLinkLocalRouteTable(String linkLocalBr) {
+ private void deleteExistingLinkLocalRouteTable(String linkLocalBr) {
Script command = new Script("/bin/bash", _timeout);
command.add("-c");
command.add("ip route | grep " + NetUtils.getLinkLocalCIDR());
@@ -286,7 +287,11 @@ public class BridgeVifDriver extends VifDriverBase {
String[] lines = parser.getLines().split("\\n");
for (String line : lines) {
String[] tokens = line.split(" ");
- if (!tokens[2].equalsIgnoreCase(linkLocalBr)) {
+ if (tokens != null && tokens.length < 2) {
+ continue;
+ }
+ final String device = tokens[2];
+ if (!Strings.isNullOrEmpty(device) && !device.equalsIgnoreCase(linkLocalBr)) {
Script.runSimpleBashScript("ip route del " + NetUtils.getLinkLocalCIDR() + " dev " + tokens[2]);
} else {
foundLinkLocalBr = true;
@@ -300,7 +305,7 @@ public class BridgeVifDriver extends VifDriverBase {
}
private void createControlNetwork(String privBrName) {
- deleteExitingLinkLocalRouteTable(privBrName);
+ deleteExistingLinkLocalRouteTable(privBrName);
if (!isBridgeExists(privBrName)) {
Script.runSimpleBashScript("brctl addbr " + privBrName + "; ip link set " + privBrName + " up; ip address add 169.254.0.1/16 dev " + privBrName, _timeout);
}
[2/2] git commit: updated refs/heads/4.5 to acf1baf
Posted by bh...@apache.org.
Merge pull request #733 from shapeblue/kvm-linkbr-checks
CLOUDSTACK-8749: Add checks to prevent malformed/unexpected inputBased on @jburwell's comment on PR #718
* pr/733:
CLOUDSTACK-8749: Add checks to prevent malformed/unexpected input
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/acf1baf1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/acf1baf1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/acf1baf1
Branch: refs/heads/4.5
Commit: acf1baf1a38e91c05dc9d1f9a1b9a6d330bdd5fb
Parents: 3d9cbf0 2a382e0
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Aug 26 14:20:13 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Aug 26 14:20:13 2015 +0530
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/BridgeVifDriver.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------