X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plnet.py;h=fdd2ea1f05b21610a8cfb9ac03f12b101853bda8;hb=4a728f79b1a701d5a626dee0e4a8171df785100d;hp=540a6990c7f36d6e8ae306b66c16596391b24f4f;hpb=ebf067a4dbd929f923c971a54b20f3afcb522ed7;p=pyplnet.git

diff --git a/plnet.py b/plnet.py
index 540a699..fdd2ea1 100755
--- a/plnet.py
+++ b/plnet.py
@@ -13,6 +13,20 @@ import modprobe
 global version
 version = 4.3
 
+def ovs_check(logger):
+    """ Return True if openvswitch is running, False otherwise. Try restarting
+        it once.
+    """
+    rc = os.system("service openvswitch status")
+    if rc!=0:
+        logger.log("net: restarting openvswitch")
+        rc = os.system("service openvswitch restart")
+    rc = os.system("service openvswitch status")
+    if rc!=0:
+        logger.log("net: failed to restart openvswitch")
+        return False
+    return True
+
 def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeManager"):
     global version
 
@@ -110,8 +124,12 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
 
             for setting in settings:
                 settingname = setting[name_key].upper()
-                if settingname in ('IFNAME','ALIAS','CFGOPTIONS','DRIVER'):
+                if settingname in ('IFNAME','ALIAS','CFGOPTIONS','DRIVER','VLAN','TYPE','DEVICETYPE'):
+                    details[settingname]=setting['value']
+                # IPv6 support on IPv4 interface
+                elif settingname in ('IPV6ADDR','IPV6_DEFAULTGW','IPV6ADDR_SECONDARIES'):
                     details[settingname]=setting['value']
+                    details['IPV6INIT']='yes'
                 # wireless settings
                 elif settingname in \
                         [  "MODE", "ESSID", "NW", "FREQ", "CHANNEL", "SENS", "RATE",
@@ -122,6 +140,15 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
                 # Bridge setting
                 elif settingname in [ 'BRIDGE' ]:
                     details['BRIDGE'] = setting['value']
+                elif settingname in [ 'OVS_BRIDGE' ]:
+                    # If openvswitch isn't running, then we'll lose network
+                    # connectivity when we reconfigure eth0.
+                    if ovs_check(logger):
+                        details['OVS_BRIDGE'] = setting['value']
+                        details['TYPE'] = "OVSPort"
+                        details['DEVICETYPE'] = "ovs"
+                    else:
+                        logger.log("net:InitInterfaces ERROR: OVS_BRIDGE specified, yet ovs is not running")
                 else:
                     logger.log("net:InitInterfaces WARNING: ignored setting named %s"%setting[name_key])
 
@@ -155,22 +182,30 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
             else:
                 logger.log("net:InitInterfaces WARNING: interface alias (%s) not matched to an interface"% details['ALIAS'])
             device_id -= 1
-        elif 'BRIDGE' in details:
-            #The bridge inherits the mac of the first attached interface.
-            if 'IFNAME' in details:
-                ifname = details['IFNAME']
-                device_id -= 1
+        elif ('BRIDGE' in details or 'OVS_BRIDGE' in details) and 'IFNAME' in details:
+            # The bridge inherits the mac of the first attached interface.
+            ifname = details['IFNAME']
+            device_id -= 1
+            if 'BRIDGE' in details:
+                bridgeName = details['BRIDGE']
+                bridgeType = 'Bridge'
             else:
-                ifname = 'eth0'
-                device_id -= 1
-            logger.log('net:InitInterfaces: Bridge detected. Adding %s to devices_map' % ifname)
+                bridgeName = details['OVS_BRIDGE']
+                bridgeType = 'OVSBridge'
+
+            logger.log('net:InitInterfaces: %s detected. Adding %s to devices_map' % (bridgeType, ifname))
             devices_map[ifname] = removeBridgedIfaceDetails(details)
-            bridgeName = details['BRIDGE']
 
-            logger.log('net:InitInterfaces: Adding bridge %s' % bridgeName)
+            logger.log('net:InitInterfaces: Adding %s %s' % (bridgeType, bridgeName))
             bridgeDetails = prepDetails(interface)
             bridgeDevices.append(bridgeName)
-            bridgeDetails['TYPE']   = 'Bridge'
+            bridgeDetails['TYPE'] = bridgeType
+            if bridgeType == 'OVSBridge':
+                bridgeDetails['DEVICETYPE'] = 'ovs'
+                if bridgeDetails['BOOTPROTO'] == 'dhcp':
+                    del bridgeDetails['BOOTPROTO']
+                    bridgeDetails['OVSBOOTPROTO'] = 'dhcp'
+                    bridgeDetails['OVSDHCPINTERFACES'] = ifname
             devices_map[bridgeName] = bridgeDetails
         else:
             if 'IFNAME' in details:
@@ -459,8 +494,6 @@ if __name__ == "__main__":
     parser.add_option("-p", "--program", action="store", type="string",
                       dest="program", default="plnet")
     (options, args) = parser.parse_args()
-    options.root = ''
-    options.verbose = True
     if len(args) != 1 or options.root is None:
         print sys.argv
         print >>sys.stderr, "Missing root or node_id"