Skip to content

kvm: Use 'ip' instead of 'brctl' #3623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 2 commits into from
Nov 11, 2019
Merged

kvm: Use 'ip' instead of 'brctl' #3623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a13dc6
kvm: Use 'ip' instead of 'brctl'
wido Oct 7, 2019
d3ae86b
kvm/modifyvlan: Use 'ip' instead of 'brctl'
wido Oct 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,12 +273,12 @@ public void unplug(LibvirtVMDef.InterfaceDef iface) {

@Override
public void attach(LibvirtVMDef.InterfaceDef iface) {
Script.runSimpleBashScript("brctl addif " + iface.getBrName() + " " + iface.getDevName());
Script.runSimpleBashScript("ip link set " + iface.getDevName() + " master " + iface.getBrName());
}

@Override
public void detach(LibvirtVMDef.InterfaceDef iface) {
Script.runSimpleBashScript("test -d /sys/class/net/" + iface.getBrName() + "/brif/" + iface.getDevName() + " && brctl delif " + iface.getBrName() + " " + iface.getDevName());
Script.runSimpleBashScript("test -d /sys/class/net/" + iface.getBrName() + "/brif/" + iface.getDevName() + " && ip link set " + iface.getDevName() + " nomaster");
}

private String generateVnetBrName(String pifName, String vnetId) {
Expand Down
2 changes: 1 addition & 1 deletion plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/IvsVifDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ private void deleteExitingLinkLocalRouteTable(String linkLocalBr) {
public void createControlNetwork(String privBrName) {
deleteExitingLinkLocalRouteTable(privBrName);
if (!isBridgeExists(privBrName)) {
Script.runSimpleBashScript("brctl addbr " + privBrName + "; ip link set " + privBrName + " up");
Script.runSimpleBashScript("ip link add " + privBrName + " type bridge; ip link set " + privBrName + " up");
Script.runSimpleBashScript("ip address add " + NetUtils.getLinkLocalAddressFromCIDR(_controlCidr) + " dev " + privBrName, _timeout);
}
}
Expand Down
9 changes: 4 additions & 5 deletions scripts/vm/network/vnet/modifyvlan.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ addVlan() {

if [ ! -d /sys/class/net/$vlanBr ]
then
brctl addbr $vlanBr > /dev/null
ip link add name $vlanBr type bridge
ip link set $vlanBr up

if [ $? -gt 0 ]
then
Expand All @@ -62,15 +63,13 @@ addVlan() {
return 2
fi
fi

brctl setfd $vlanBr 0
fi

#pif is eslaved into vlanBr?
ls /sys/class/net/$vlanBr/brif/ |grep -w "$vlanDev" > /dev/null
if [ $? -gt 0 ]
then
brctl addif $vlanBr $vlanDev > /dev/null
ip link set $vlanDev master $vlanBr
if [ $? -gt 0 ]
then
ls /sys/class/net/$vlanBr/brif/ |grep -w "$vlanDev" > /dev/null
Expand Down Expand Up @@ -108,7 +107,7 @@ deleteVlan() {
return 1
fi

brctl delbr $vlanBr
ip link delete $vlanBr type bridge

if [ $? -gt 0 ]
then
Expand Down