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 2013/01/25 04:31:54 UTC
[2/50] [abbrv] git commit: Summary: Apply feedback from Wido
Summary: Apply feedback from Wido
Better checking on VlanID
Correct speling mistake
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a0373fe1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a0373fe1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a0373fe1
Branch: refs/heads/javelin
Commit: a0373fe1ff2001c5a9deee537d6862327f8818cc
Parents: 04f8262
Author: Hugo Trippaers <tr...@gmail.com>
Authored: Mon Jan 21 12:34:20 2013 +0100
Committer: Hugo Trippaers <tr...@gmail.com>
Committed: Mon Jan 21 12:34:20 2013 +0100
----------------------------------------------------------------------
.../hypervisor/kvm/resource/BridgeVifDriver.java | 4 ++--
.../hypervisor/kvm/resource/LibvirtVMDef.java | 2 +-
.../hypervisor/kvm/resource/OvsVifDriver.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a0373fe1/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 bde4da2..b897df2 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
@@ -176,7 +176,7 @@ public class BridgeVifDriver extends VifDriverBase {
createControlNetwork(_bridges.get("linklocal"));
}
- private void deletExitingLinkLocalRoutTable(String linkLocalBr) {
+ private void deleteExitingLinkLocalRouteTable(String linkLocalBr) {
Script command = new Script("/bin/bash", _timeout);
command.add("-c");
command.add("ip route | grep " + NetUtils.getLinkLocalCIDR());
@@ -201,7 +201,7 @@ public class BridgeVifDriver extends VifDriverBase {
}
private void createControlNetwork(String privBrName) {
- deletExitingLinkLocalRoutTable(privBrName);
+ deleteExitingLinkLocalRouteTable(privBrName);
if (!isBridgeExists(privBrName)) {
Script.runSimpleBashScript("brctl addbr " + privBrName + "; ifconfig " + privBrName + " up; ifconfig " +
privBrName + " 169.254.0.1", _timeout);
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a0373fe1/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index c02d8fc..acfd9cf 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -748,7 +748,7 @@ public class LibvirtVMDef {
}
netBuilder.append("</virtualport>\n");
}
- if (_vlanTag != -1) {
+ if (_vlanTag > 0 && _vlanTag < 4095) {
netBuilder.append("<vlan trunk='no'>\n<tag id='" + _vlanTag + "'/>\n</vlan>");
}
netBuilder.append("</interface>\n");
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a0373fe1/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java
index 04c29a8..37761aa 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java
@@ -143,7 +143,7 @@ public class OvsVifDriver extends VifDriverBase {
return brName;
}
- private void deleteExitingLinkLocalRoutTable(String linkLocalBr) {
+ private void deleteExitingLinkLocalRouteTable(String linkLocalBr) {
Script command = new Script("/bin/bash", _timeout);
command.add("-c");
command.add("ip route | grep " + NetUtils.getLinkLocalCIDR());
@@ -168,7 +168,7 @@ public class OvsVifDriver extends VifDriverBase {
}
private void createControlNetwork(String privBrName) {
- deleteExitingLinkLocalRoutTable(privBrName);
+ deleteExitingLinkLocalRouteTable(privBrName);
if (!isBridgeExists(privBrName)) {
Script.runSimpleBashScript("ovs-vsctl add-br " + privBrName + "; ifconfig " + privBrName + " up; ifconfig " +
privBrName + " 169.254.0.1", _timeout);