Pylint warning fixes

Change-Id: I995e2158a3f37b773c83f5d1aee2203a2b87082f

1 files changed, 76 insertions, 76 deletions

diff --git a/admin.py b/admin.py
index 26964f4..6f1aef9 100755
--- a/admin.py
+++ b/admin.py
@@ -34,7 +34,7 @@ from ipc.ipc import VlanIpc
 prog = "admin"
 version = "0.6-DEV"
 banner = "Linaro VLANd admin interface, version %s" % version
-exit = Error.OK
+exitcode = Error.OK
 TRUNK_ID_NONE = -1
 
 def is_positive(text):
@@ -386,8 +386,8 @@ if args.which == 'status':
         print '  knows about %d port(s)' % len(ports)
         vlans = call_vland('db_query', {'command':'db.all_vlans', 'data':None})
         print '  DB knows about %d vlan(s)' % len(vlans)
-    except:
-        exit = Error.FAILED
+    except (InputError, NotFoundError):
+        exitcode = Error.FAILED
 elif args.which == 'shutdown':
     try:
         print 'Asking VLANd to shutdown'
@@ -396,20 +396,20 @@ elif args.which == 'shutdown':
                             'data': None})
         for field in shutdown:
             print '%s: %s' % (field, shutdown[field])
-    except:
-        exit = Error.FAILED                
+    except (InputError, NotFoundError):
+        exitcode = Error.FAILED
 elif args.which == 'vland_version':
     try:
         ver = call_vland('daemon_query', {'command':'daemon.version', 'data': None})
         print 'VLANd version %s' % ver['version']
-    except:
-        exit = Error.FAILED        
+    except (InputError, NotFoundError):
+        exitcode = Error.FAILED
 elif args.which == 'statistics':
     try:
         stats = call_vland('daemon_query', {'command':'daemon.statistics', 'data': None})
         print 'VLANd uptime: %d seconds' % stats['uptime']
-    except:
-        exit = Error.FAILED        
+    except (InputError, NotFoundError):
+        exitcode = Error.FAILED
 elif args.which == 'version':
     print 'VLANd admin interface version %s' % version
 elif args.which == 'auto_import_switch':
@@ -422,9 +422,9 @@ elif args.which == 'auto_import_switch':
                         'data':
                         {'switch': args.name}})
         print 'VLANd imported switch %s successfully: new switch_id %d, %d new ports, %d new VLANs' % (args.name, imp['switch_id'], imp['num_ports_added'], imp['num_vlans_added'])
-    except:
+    except (InputError, NotFoundError):
         print 'Import failed - see log for details'
-        exit = Error.FAILED
+        exitcode = Error.FAILED
 elif args.which == 'probe_switches':
     print 'Asking VLANd to probe all the configured switches'
     try:
@@ -433,37 +433,37 @@ elif args.which == 'probe_switches':
                             'data': None})
         for field in probe:
             print '%s: %s' % (field, probe[field])
-    except:
+    except (InputError, NotFoundError):
         print 'Probe failed - see log for details'
-        exit = Error.FAILED
+        exitcode = Error.FAILED
 elif args.which == 'list_all_switches':
     try:
         result = call_vland('db_query', {'command':'db.all_switches', 'data':None})
         for line in result:
             dump_switch(line)
-    except:
-        exit = Error.FAILED        
+    except (InputError, NotFoundError):
+        exitcode = Error.FAILED
 elif args.which == 'list_all_ports':
     try:
         result = call_vland('db_query', {'command':'db.all_ports', 'data':None})
         for line in result:
             dump_port(line)
-    except:
-        exit = Error.FAILED
+    except (InputError, NotFoundError):
+        exitcode = Error.FAILED
 elif args.which == 'list_all_vlans':
     try:
         result = call_vland('db_query', {'command':'db.all_vlans', 'data':None})
         for line in result:
             dump_vlan(line)
-    except:
-        exit = Error.FAILED        
+    except (InputError, NotFoundError):
+        exitcode = Error.FAILED
 elif args.which == 'list_all_trunks':
     try:
         result = call_vland('db_query', {'command':'db.all_trunks', 'data':None})
         for line in result:
             dump_trunk(line)
-    except:
-        exit = Error.FAILED        
+    except (InputError, NotFoundError):
+        exitcode = Error.FAILED
 elif args.which == 'create_switch':
     try:
         switch_id = call_vland('db_update',
@@ -473,7 +473,7 @@ elif args.which == 'create_switch':
         print 'Created switch_id %d' % switch_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
 elif args.which == 'create_port':
     try:
         port_id = call_vland('db_update',
@@ -485,10 +485,10 @@ elif args.which == 'create_port':
         print 'Created port_id %d' % port_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 elif args.which == 'create_vlan':
     try:
         (vlan_id, vlan_tag) = call_vland('vlan_update',
@@ -500,10 +500,10 @@ elif args.which == 'create_vlan':
         print 'Created VLAN tag %d as vlan_id %d' % (vlan_tag, vlan_id)
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 elif args.which == 'create_trunk':
     try:
         trunk_id = call_vland('db_update',
@@ -514,10 +514,10 @@ elif args.which == 'create_trunk':
         print 'Created trunk_id %d' % trunk_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 elif args.which == 'delete_switch':
     try:
         switch_id = call_vland('db_update',
@@ -526,10 +526,10 @@ elif args.which == 'delete_switch':
         print 'Deleted switch_id %s' % switch_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 elif args.which == 'delete_port':
     try:
         port_id = call_vland('db_update',
@@ -538,10 +538,10 @@ elif args.which == 'delete_port':
         print 'Deleted port_id %s' % port_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 elif args.which == 'delete_vlan':
     try:
         vlan_id = call_vland('vlan_update',
@@ -550,10 +550,10 @@ elif args.which == 'delete_vlan':
         print 'Deleted vlan_id %d' % vlan_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 elif args.which == 'delete_trunk':
     try:
         port_id = call_vland('db_update',
@@ -562,10 +562,10 @@ elif args.which == 'delete_trunk':
         print 'Deleted trunk_id %s' % trunk_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 elif args.which == 'lookup_switch_by_name':
     try:
         switch_id = call_vland('db_query',
@@ -575,10 +575,10 @@ elif args.which == 'lookup_switch_by_name':
             print '%d' % switch_id
         else:
             print 'No switch found for name %s' % args.name
-            exit = Error.NOTFOUND
+            exitcode = Error.NOTFOUND
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
 elif args.which == 'show_switch':
     try:
         this_switch = call_vland('db_query',
@@ -591,7 +591,7 @@ elif args.which == 'show_switch':
             print 'No switch found for switch_id %s' % args.switch_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
 elif args.which == 'show_port':
     try:
         this_port = call_vland('db_query',
@@ -602,10 +602,10 @@ elif args.which == 'show_port':
             dump_port(this_port)
         else:
             print 'No port found for port_id %s' % args.port_id
-            exit = Error.NOTFOUND
+            exitcode = Error.NOTFOUND
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
 elif args.which == 'lookup_port_by_switch_and_name':
     try:
         p = call_vland('db_query',
@@ -617,7 +617,7 @@ elif args.which == 'lookup_port_by_switch_and_name':
             print p
         else:
             print 'No port found for switch_id %s, name %s' % (args.switch_id, args.name)
-            exit = Error.NOTFOUND
+            exitcode = Error.NOTFOUND
     except InputError as inst:
         print 'Failed: %s' % inst
 elif args.which == 'lookup_port_by_switch_and_number':
@@ -633,7 +633,7 @@ elif args.which == 'lookup_port_by_switch_and_number':
             print 'No port found for switch_id %s, port number %s' % (args.switch_id, args.number)
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
 elif args.which == 'lookup_ports_by_switch':
     try:
         p = call_vland('db_query',
@@ -645,10 +645,10 @@ elif args.which == 'lookup_ports_by_switch':
                 print port_id
         else:
             print 'No ports found for switch_id %s' % args.switch_id
-            exit = Error.NOTFOUND
+            exitcode = Error.NOTFOUND
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
 elif args.which == 'lookup_ports_by_current_vlan':
     try:
         p = call_vland('db_query',
@@ -660,10 +660,10 @@ elif args.which == 'lookup_ports_by_current_vlan':
                 print port_id
         else:
             print 'No ports found for current vlan_id %s' % args.vlan_id
-            exit = Error.NOTFOUND
+            exitcode = Error.NOTFOUND
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
 elif args.which == 'lookup_ports_by_base_vlan':
     try:
         p = call_vland('db_query',
@@ -675,10 +675,10 @@ elif args.which == 'lookup_ports_by_base_vlan':
                 print port_id
         else:
             print 'No ports found for base vlan_id %s' % args.vlan_id
-            exit = Error.NOTFOUND
+            exitcode = Error.NOTFOUND
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
 elif args.which == 'lookup_ports_by_trunk':
     try:
         p = call_vland('db_query',
@@ -690,10 +690,10 @@ elif args.which == 'lookup_ports_by_trunk':
                 print port_id
         else:
             print 'No ports found for trunk_id %s' % args.trunk_id
-            exit = Error.NOTFOUND
+            exitcode = Error.NOTFOUND
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
 elif args.which == 'set_port_mode':
     try:
         port_id = call_vland('vlan_update',
@@ -704,10 +704,10 @@ elif args.which == 'set_port_mode':
         print "Updated mode for port_id %d" % port_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 elif args.which == 'lock_port':
     try:
         port_id = call_vland('db_update',
@@ -718,10 +718,10 @@ elif args.which == 'lock_port':
         print "Locked port_id %d" % port_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 elif args.which == 'unlock_port':
     try:
         port_id = call_vland('db_update',
@@ -732,10 +732,10 @@ elif args.which == 'unlock_port':
         print "Unlocked port_id %d" % port_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 elif args.which == 'set_port_current_vlan':
     try:
         port_id = call_vland('vlan_update',
@@ -746,10 +746,10 @@ elif args.which == 'set_port_current_vlan':
         print "Set current VLAN on port_id %d" % port_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 elif args.which == 'get_port_current_vlan':
     try:
         vlan_id = call_vland('db_query',
@@ -762,10 +762,10 @@ elif args.which == 'get_port_current_vlan':
             print "No current_vlan_id found for port_id %s" % args.port_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 elif args.which == 'set_port_base_vlan':
     try:
         port_id = call_vland('db_update',
@@ -776,10 +776,10 @@ elif args.which == 'set_port_base_vlan':
         print "Set base VLAN on port_id %d" % port_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 elif args.which == 'get_port_base_vlan':
     try:
         vlan_id = call_vland('db_query',
@@ -792,10 +792,10 @@ elif args.which == 'get_port_base_vlan':
             print "No base_vlan_id found for port_id %d" % port_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 elif args.which == 'restore_port_to_base_vlan':
     try:
         port_id = call_vland('vlan_update',
@@ -805,10 +805,10 @@ elif args.which == 'restore_port_to_base_vlan':
         print "Restored port_id %d back to base VLAN" % port_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 elif args.which == 'show_vlan':
     try:
         v = call_vland('db_query',
@@ -821,10 +821,10 @@ elif args.which == 'show_vlan':
             print 'No VLAN found for vlan_id %s' % args.vlan_id
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 elif args.which == 'lookup_vlan_by_tag':
     try:
         vlan_id = call_vland('db_query',
@@ -835,10 +835,10 @@ elif args.which == 'lookup_vlan_by_tag':
             print vlan_id
         else:
             print 'No VLAN found for vlan tag %s' % args.tag
-            exit = Error.NOTFOUND
+            exitcode = Error.NOTFOUND
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
 elif args.which == 'show_vlan_tag':
     try:
         vlan_tag = call_vland('db_query',
@@ -849,10 +849,10 @@ elif args.which == 'show_vlan_tag':
             print vlan_tag
         else:
             print 'No VLAN found for vlan id %s' % args.vlan_id
-            exit = Error.NOTFOUND
+            exitcode = Error.NOTFOUND
     except InputError as inst:
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
 elif args.which == 'show_trunk':
     try:
         this_trunk = call_vland('db_query',
@@ -866,11 +866,11 @@ elif args.which == 'show_trunk':
     except InputError as inst:
         print 'Failed: %s' % inst
         print 'Failed: %s' % inst
-        exit = Error.FAILED
+        exitcode = Error.FAILED
     except NotFoundError as inst:
         print 'Failed: %s' % inst
-        exit = Error.NOTFOUND
+        exitcode = Error.NOTFOUND
 else:
     print 'No recognised command given. Try -h for help'
 
-sys.exit(exit)
+sys.exit(exitcode)