You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/01/02 15:18:15 UTC
git commit: updated refs/heads/master to 725bed4
Updated Branches:
refs/heads/master c024a9382 -> 725bed43b
Wei Zhou found another statement that was effected by commit 3a999e7 in
OvsVifDriver.isBridgeExists.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/725bed43
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/725bed43
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/725bed43
Branch: refs/heads/master
Commit: 725bed43b4ca65389ed4eac651d92d1ed5995cac
Parents: c024a93
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Thu Jan 2 15:12:11 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Thu Jan 2 15:12:11 2014 +0100
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/725bed43/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 dc60f07..79606b3 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
@@ -74,7 +74,7 @@ public class OvsVifDriver extends VifDriverBase {
if (nic.getType() == Networks.TrafficType.Guest) {
Integer networkRateKBps = (nic.getNetworkRateMbps() != null && nic.getNetworkRateMbps().intValue() != -1) ? nic.getNetworkRateMbps().intValue() * 128 : 0;
if ((nic.getBroadcastType() == Networks.BroadcastDomainType.Vlan || nic.getBroadcastType() == Networks.BroadcastDomainType.Pvlan) &&
- !vlanId.equalsIgnoreCase("untagged")) {
+ !vlanId.equalsIgnoreCase("untagged")) {
if (trafficLabel != null && !trafficLabel.isEmpty()) {
s_logger.debug("creating a vlan dev and bridge for guest traffic per traffic label " + trafficLabel);
intf.defBridgeNet(_pifs.get(trafficLabel), null, nic.getMac(), getGuestNicModel(guestOsType), networkRateKBps);
@@ -143,7 +143,7 @@ public class OvsVifDriver extends VifDriverBase {
}
if (!foundLinkLocalBr) {
Script.runSimpleBashScript("ifconfig " + linkLocalBr + " 169.254.0.1;" + "ip route add " + NetUtils.getLinkLocalCIDR() + " dev " + linkLocalBr + " src " +
- NetUtils.getLinkLocalGateway());
+ NetUtils.getLinkLocalGateway());
}
}
@@ -159,7 +159,7 @@ public class OvsVifDriver extends VifDriverBase {
command.add("-c");
command.add("ovs-vsctl br-exists " + bridgeName);
String result = command.execute(null);
- if ("Ok".equals(result)) {
+ if ("0".equals(result)) {
return true;
} else {
return false;