Handle VM with no network configuration and restrict ethernet channels on Linux

[aegiap]

Restrict virtio channel configuration to Linux.

Handle VM configuration JSON with no network interface.

[grigouze]

+1

[kalou]

Would moving the "vif" key check to network_setup_check make sense ?

That would extend the function meaning to "we want it, and we can" -- but also remove a bit of complexity down in the main function if you want to make virtio config depend on that as well

[aegiap]

@kalou somehing like:

diff --git a/swap_init.py b/swap_init.py
index dfcd01b..587515d 100755
--- a/swap_init.py
+++ b/swap_init.py
@@ -259,14 +259,17 @@ def network_disable_dhcp(vif_list, default_file):
     file(default_file, 'w').write(''.join(new_entries))
 
 
-def network_setup_check(default_file):
+def network_setup_check(default_file, vm_conf):
     """ Check if the system admin wants to have the network auto-configured.
     """
     for entry in file(default_file).readlines():
         if entry.startswith('CONFIG_NETWORK=0') or \
            entry.startswith('CONFIG_NETWORK = 0'):
             return False
-    return True
+    if vm_conf.get('vif', []):
+        return True
+    else:
+        return False
 
 
 def nameserver_setup_check(default_file):
@@ -616,12 +619,10 @@ if __name__ == '__main__':
         nameservers = conf.get('nameservers', [])
         resolver_setup(nameservers)
 
-    if network_setup_check(default_file):
+    if network_setup_check(default_file, conf):
         vm_hostname = conf.get('vm_hostname', '')
-        vif = conf.get('vif', [])
-        if vif:
-            network_setup(vm_hostname, vif)
-            network_enable(vif)
+        network_setup(vm_hostname, vif)
+        network_enable(vif)
     try:
         if os.path.exists('/sys/module/virtio_net'):
             vif = conf.get('vif', [])

[kalou]

Yeah, would the virtio config also be a good thing to put under the network config check ?
So you can also get rid of the vif presence check there