apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Summary: Apply feedback from Wido

Browse Source 
Better checking on VlanID

Correct speling mistake
This commit is contained in:
Hugo Trippaers 2013-01-21 12:34:20 +01:00
parent 04f82623f6
commit a0373fe1ff
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
View File

@ -176,7 +176,7 @@ public class BridgeVifDriver extends VifDriverBase {
createControlNetwork(_bridges.get("linklocal")); createControlNetwork(_bridges.get("linklocal"));
} }
private void deletExitingLinkLocalRoutTable(String linkLocalBr) { private void deleteExitingLinkLocalRouteTable(String linkLocalBr) {
Script command = new Script("/bin/bash", _timeout); Script command = new Script("/bin/bash", _timeout);
command.add("-c"); command.add("-c");
command.add("ip route | grep " + NetUtils.getLinkLocalCIDR()); command.add("ip route | grep " + NetUtils.getLinkLocalCIDR());
@ -201,7 +201,7 @@ public class BridgeVifDriver extends VifDriverBase {
} }
private void createControlNetwork(String privBrName) { private void createControlNetwork(String privBrName) {
deletExitingLinkLocalRoutTable(privBrName); deleteExitingLinkLocalRouteTable(privBrName);
if (!isBridgeExists(privBrName)) { if (!isBridgeExists(privBrName)) {
Script.runSimpleBashScript("brctl addbr " + privBrName + "; ifconfig " + privBrName + " up; ifconfig " + Script.runSimpleBashScript("brctl addbr " + privBrName + "; ifconfig " + privBrName + " up; ifconfig " +
privBrName + " 169.254.0.1", _timeout); privBrName + " 169.254.0.1", _timeout);

2
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
View File

@ -748,7 +748,7 @@ public class LibvirtVMDef {
} }
netBuilder.append("</virtualport>\n"); 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("<vlan trunk='no'>\n<tag id='" + _vlanTag + "'/>\n</vlan>");
} }
netBuilder.append("</interface>\n"); netBuilder.append("</interface>\n");

4
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/OvsVifDriver.java
View File

@ -143,7 +143,7 @@ public class OvsVifDriver extends VifDriverBase {
return brName; return brName;
} }
private void deleteExitingLinkLocalRoutTable(String linkLocalBr) { private void deleteExitingLinkLocalRouteTable(String linkLocalBr) {
Script command = new Script("/bin/bash", _timeout); Script command = new Script("/bin/bash", _timeout);
command.add("-c"); command.add("-c");
command.add("ip route | grep " + NetUtils.getLinkLocalCIDR()); command.add("ip route | grep " + NetUtils.getLinkLocalCIDR());
@ -168,7 +168,7 @@ public class OvsVifDriver extends VifDriverBase {
} }
private void createControlNetwork(String privBrName) { private void createControlNetwork(String privBrName) {
deleteExitingLinkLocalRoutTable(privBrName); deleteExitingLinkLocalRouteTable(privBrName);
if (!isBridgeExists(privBrName)) { if (!isBridgeExists(privBrName)) {
Script.runSimpleBashScript("ovs-vsctl add-br " + privBrName + "; ifconfig " + privBrName + " up; ifconfig " + Script.runSimpleBashScript("ovs-vsctl add-br " + privBrName + "; ifconfig " + privBrName + " up; ifconfig " +
privBrName + " 169.254.0.1", _timeout); privBrName + " 169.254.0.1", _timeout);