agent: kvm - remove bridge-utils dependency

Author: davidjumani

plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmNetworkModule.py

@@ -184,8 +184,8 @@ def _createBridge(self, bridge):
         @return : success
         ex. {bridge:xapi100, attach:eth0.100}
         create bridge interface, and attached it 
-        cmd 1: brctl addbr bridge
-        cmd 2: brctl addif brdige attach
+        cmd 1: ip link add bridge
+        cmd 2: ip link set dev
         """
 
         if "xenbr" not in bridge.name and "vlan" not in bridge.name:
@@ -206,8 +206,8 @@ def _createBridge(self, bridge):
             logger.error(self._createBridge, msg)
             raise Exception(msg)
 
-        doCmd(['brctl', 'addbr', bridge.name])
-        doCmd(['brctl', 'addif', bridge.name, bridge.attach])
+        doCmd(['ip', 'link', 'add', 'name', bridge.name, 'type', 'bridge'])
+        doCmd(['ip', 'link', 'set', 'dev', bridge.attach, 'master', bridge.name])
         self.bringUP(bridge.name)
         logger.debug(self._createBridge, "Create bridge %s on %s successfully"%(bridge.name, bridge.attach))
         return self.bridges[bridge.name]
@@ -228,7 +228,7 @@ def _deleteBridge(self, name):
             logger.debug(self._deleteBridge, "There are still some interfaces(%s) on bridge %s"%(bridge.interfaces, bridge.name))
             return False
         self.bringDown(bridge.name)
-        doCmd(['brctl', 'delbr', bridge.name])
+        doCmd(['ip', 'link', 'del', bridge.name])
         logger.debug(self._deleteBridge, "Delete bridge %s successfully"%bridge.name)
         return True
 

plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmSecurityGroupModule.py

@@ -107,7 +107,7 @@ def add_fw_framework(bridge_name):
                 execute("iptables -I FORWARD -o " + bridge_name + " -j DROP")
                 execute("iptables -I FORWARD -i " + bridge_name + " -m physdev --physdev-is-bridged -j " + brfw)
                 execute("iptables -I FORWARD -o " + bridge_name + " -m physdev --physdev-is-bridged -j " + brfw)
-                phydev = execute("brctl show |grep " + bridge_name + " | awk '{print $4}'").strip()
+                phydev = execute("ip link show type bridge |grep " + bridge_name + " | awk '{print $4}'").strip()
                 execute("iptables -A " + brfw + " -m physdev --physdev-is-bridged --physdev-out " + phydev + " -j ACCEPT")
                 execute("iptables -A " + brfw + " -m state --state RELATED,ESTABLISHED -j ACCEPT")
                 execute("iptables -A " + brfw + " -m physdev --physdev-is-bridged --physdev-is-out -j " + brfwout)

scripts/util/qemu-ifup

@@ -17,5 +17,5 @@
 # under the License.
 
  switch=$(/sbin/ip route list | awk '/^default / { print $NF }') 
-/sbin/ifconfig $1 0.0.0.0 up 
-/usr/sbin/brctl addif ${switch} $1 
+/sbin/ifconfig $1 0.0.0.0 up
+/sbin/ip link set dev $1 master ${switch}

scripts/vm/hypervisor/xenserver/vmops

@@ -162,7 +162,7 @@ def setLinkLocalIP(session, args):
 
         if result.lower().strip() == "bridge":
             try:
-                cmd = ["brctl", "addbr", brName]
+                cmd = ["ip", "link", "add", "name", brName, "type", "bridge"]
                 txt = util.pread2(cmd)
             except:
                 pass

scripts/vm/network/security_group.py

@@ -1451,7 +1451,7 @@ def verify_iptables_rules_for_bridge(brname):
     expected_rules.append("-A %s -m state --state RELATED,ESTABLISHED -j ACCEPT" % (brfw))
     expected_rules.append("-A %s -m physdev --physdev-is-in --physdev-is-bridged -j %s" % (brfw, brfwin))
     expected_rules.append("-A %s -m physdev --physdev-is-out --physdev-is-bridged -j %s" % (brfw, brfwout))
-    phydev = execute("brctl show | awk '/^%s[ \t]/ {print $4}'" % brname ).strip()
+    phydev = execute("ip link show type bridge | awk '/^%s[ \t]/ {print $4}'" % brname ).strip()
     expected_rules.append("-A %s -m physdev --physdev-out %s --physdev-is-bridged -j ACCEPT" % (brfw, phydev))
 
     rules = execute("iptables-save |grep -w %s |grep -v \"^:\"" % brfw).split('\n')