1 files changed, 12 insertions, 4 deletions
diff --git a/tools/democonf2rumba.py b/tools/democonf2rumba.py
index cda112c..d9ea8e7 100755
--- a/tools/democonf2rumba.py
+++ b/tools/democonf2rumba.py
@@ -202,22 +202,30 @@ if __name__ == '__main__':
         import rumba.testbeds.emulab as emulab
         test_class = emulab.Testbed
         testbed_args = {a.dest: getattr(args, a.dest)
-                        for a in emulab_p._actions if a.dest != 'help'}
+                        for a in emulab_p._actions
+                        if a.dest != 'help'
+                        and getattr(args, a.dest) is not None}
     elif args.testbed == 'jfed':
         import rumba.testbeds.jfed as jfed
         test_class = jfed.Testbed
         testbed_args = {a.dest: getattr(args, a.dest)
-                        for a in jfed_p._actions if a.dest != 'help'}
+                        for a in jfed_p._actions
+                        if a.dest != 'help'
+                        and getattr(args, a.dest) is not None}
     elif args.testbed == 'qemu':
         import rumba.testbeds.qemu as qemu
         test_class = qemu.Testbed
         testbed_args = {a.dest: getattr(args, a.dest)
-                        for a in qemu_p._actions if a.dest != 'help'}
+                        for a in qemu_p._actions
+                        if a.dest != 'help'
+                        and getattr(args, a.dest) is not None}
     elif args.testbed == 'fake':
         import rumba.testbeds.faketestbed as fake
         test_class = fake.Testbed
         testbed_args = {a.dest: getattr(args, a.dest)
-                        for a in fake_p._actions if a.dest != 'help'}
+                        for a in fake_p._actions
+                        if a.dest != 'help'
+                        and getattr(args, a.dest) is not None}
     else:
         if args.testbed is None:
             print('Testbed type must be specified!')