Add some informational commands

seveas · seveas · commit e955abaeb997 · 2012-03-06T23:56:35.000+01:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -50,7 +50,7 @@
 # The short X.Y version.
 version = '0.9'
 # The full version, including alpha/beta/rc tags.
-release = '0.9.3'
+release = '0.9.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/index.rst b/docs/index.rst
@@ -142,5 +142,6 @@ Actions:
   activate   - Activate a connection
   deactivate - Deactivate a connection
   offline    - Deactivate all connections
-
-Suggestions for more functionality for this tool are welcome!
+  enable     - Enable specific connection types
+  disable    - Disable specific connection types
+  info       - Information about a connection
diff --git a/n-m b/n-m
@@ -12,11 +12,15 @@ Actions:
   deactivate - Deactivate a connection
   offline    - Deactivate all connections
   enable     - Enable specific connection types
-  disable    - Disable specific connection types"""
+  disable    - Disable specific connection types
+  info       - Information about a connection"""
 
+import datetime
 from dbus.exceptions import DBusException
 import NetworkManager
 import optparse
+import socket
+import struct
 import sys
 
 def main():
@@ -49,6 +53,12 @@ def main():
     elif args[0] == 'disable':
         disable(args[1:])
 
+    elif args[0] == 'info':
+        info(args[1:])
+
+    elif args[0] == 'dump':
+        dump(args[1:])
+
     else:
         p.print_help()
         sys.exit(1)
@@ -141,5 +151,67 @@ def disable(names):
             sys.exit(1)
         setattr(NetworkManager.NetworkManager, n.title() + 'Enabled', False)
 
+def info(names):
+    connections = [x.GetSettings() for x in NetworkManager.Settings.ListConnections()]
+    connections = dict([(x['connection']['id'], x) for x in connections])
+
+    for n in names:
+        if n not in connections:
+            print >>sys.stderr, "No such connection: %s" % n
+
+        line = "Info about '%s'" % n
+        print line + "\n" + '=' * len(line)
+        conn = connections[n]
+        print "Type:", conn['connection']['type']
+        print "Connect automatically:", ["No","Yes"][conn['connection'].get('autoconnect', True)]
+        print "Last connected on:", str(datetime.datetime.fromtimestamp(conn['connection']['timestamp']))
+        print "IPv4 settings (%s)" % conn['ipv4']['method']
+        print "  Address(es):", auto(ipv4s(conn['ipv4']['addresses']))
+        print "  DNS servers:", auto(ipv4s(conn['ipv4']['dns']))
+        print "  Routes:", auto(routes(conn['ipv4']['routes']))
+        print "  Can be default route:", ["Yes","No"][conn['ipv4'].get('never-default', False)]
+
+        if conn['connection']['type'] == '802-3-ethernet':
+            print "Physical link"
+            print "  MAC address:", mac(conn['802-3-ethernet'].get('mac-address'))
+        elif conn['connection']['type'] == '802-11-wireless':
+            print "Wireless link"
+            print "  MAC address:", mac(conn['802-11-wireless'].get('mac-address'))
+            print "  SSID:", ssid(conn['802-11-wireless']['ssid'])
+            print "  Wireless security:", conn[conn['802-11-wireless']['security']]['key-mgmt']
+        elif conn['connection']['type'] == 'vpn':
+            print "VPN"
+            print "  Type:", conn['vpn']['service-type'].rsplit('.',1)[-1]
+            print "  Remote:", conn['vpn']['data']['remote']
+
+def dump(names):
+    connections = [x.GetSettings() for x in NetworkManager.Settings.ListConnections()]
+    connections = dict([(x['connection']['id'], x) for x in connections])
+
+    for n in names:
+        if n not in connections:
+            print >>sys.stderr, "No such connection: %s" % n
+
+        from pprint import pprint
+        pprint(connections[n])
+
+def auto(seq):
+    return "(Automatic)" if not seq else ", ".join(seq)
+
+def ipv4(ip):
+    return socket.inet_ntoa(struct.pack('L',ip))
+
+def ipv4s(seq):
+    return [ipv4(x) for x in seq]
+
+def routes(seq):
+    return ["%s/%d -> %s" % (ipv4(x[0]), x[1], ipv4(x[2])) for x in seq]
+
+def mac(seq):
+    return "(Automatic)" if not seq else "%X:%X:%X:%X:%X:%X" % tuple(seq)
+
+def ssid(seq):
+    return "".join([chr(x) for x in seq])
+
 if __name__ == '__main__':
     main()
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from distutils.core import setup
 
 setup(name = "python-networkmanager",
-      version = "0.9.3",
+      version = "0.9.5",
       author = "Dennis Kaarsemaker",
       author_email = "dennis@kaarsemaker.net",
       url = "http://github.com/seveas/python-networkmanager",
