Changeset 190

Timestamp:

07/30/12 21:55:40 (12 years ago)

Author:

atzm

Message:

• add ctl command

File:

• etherws/trunk/etherws.py (modified) (5 diffs)

etherws/trunk/etherws.py

@@ -45 +45 @@
 import fcntl
 import base64
+import urllib2
 import hashlib
 import getpass
@@ -527 +528 @@
         except Exception as e:
             traceback.print_exc()
-            self.finish({'result': None, 'error': str(e), 'id': id_})
+            self.finish({'result': None, 'error': {'msg': str(e)}, 'id': id_})
 
     def handle_listPort(self, params):
@@ -557 +558 @@
         for p in params:
             port = self._switch.get_port(int(p['port']))
-            port.shut = bool(p['flag'])
+            port.shut = bool(p['shut'])
             list_.append(self._portstat(port))
         return {'portlist': list_}
@@ -584 +585 @@
 
 
-def start_switch(args):
+def start_sw(args):
     def daemonize(nochdir=False, noclose=False):
         if os.fork() > 0:
@@ -718 +719 @@
 
 
+def start_ctl(args):
+    import yaml
+
+    def request(args, method, params):
+        method = '.'.join([EtherWebSocketControlHandler.NAMESPACE, method])
+        data = json.dumps({'method': method, 'params': params})
+        req = urllib2.Request(args.ctlurl)
+        req.add_header('Content-type', 'application/json')
+        if args.ctluser:
+            if not args.ctlpasswd:
+                args.ctlpasswd = getpass.getpass()
+            token = base64.b64encode('%s:%s' % (args.ctluser, args.ctlpasswd))
+            req.add_header('Authorization', 'Basic %s' % token)
+        return json.loads(urllib2.urlopen(req, data).read())
+
+    def handle_ctl_addport(args):
+        raise NotImplementedError('addport')
+
+    def handle_ctl_shutport(args):
+        if args.port <= 0:
+            raise ValueError('invalid port: %d' % args.port)
+        res = request(args, 'shutPort', [{'port': args.port, 'shut': args.no}])
+        print(yaml.safe_dump(res))
+
+    def handle_ctl_delport(args):
+        if args.port <= 0:
+            raise ValueError('invalid port: %d' % args.port)
+        res = request(args, 'delPort', [{'port': args.port}])
+        print(yaml.safe_dump(res))
+
+    def handle_ctl_listport(args):
+        res = request(args, 'listPort', [])
+        print(yaml.safe_dump(res))
+
+    locals()['handle_ctl_' + args.control_method](args)
+
+
 def main():
     parser = argparse.ArgumentParser()
-    subparsers = parser.add_subparsers(dest='subcommand')
-    parser_s = subparsers.add_parser('switch')
-    parser_c = subparsers.add_parser('control')
+    subcommand = parser.add_subparsers(dest='subcommand')
+
+    # -- sw command parser
+    parser_s = subcommand.add_parser('sw')
 
     parser_s.add_argument('--debug', action='store_true', default=False)
     parser_s.add_argument('--foreground', action='store_true', default=False)
-    parser_s.add_argument('--ageout', action='store', type=int, default=300)
-
-    parser_s.add_argument('--path', action='store', default='/')
-    parser_s.add_argument('--host', action='store', default='')
-    parser_s.add_argument('--port', action='store', type=int)
-    parser_s.add_argument('--htpasswd', action='store')
-    parser_s.add_argument('--sslkey', action='store')
-    parser_s.add_argument('--sslcert', action='store')
-
-    parser_s.add_argument('--ctlpath', action='store', default='/ctl')
-    parser_s.add_argument('--ctlhost', action='store', default='')
-    parser_s.add_argument('--ctlport', action='store', type=int)
-    parser_s.add_argument('--ctlhtpasswd', action='store')
-    parser_s.add_argument('--ctlsslkey', action='store')
-    parser_s.add_argument('--ctlsslcert', action='store')
-
+    parser_s.add_argument('--ageout', type=int, default=300)
+
+    parser_s.add_argument('--path', default='/')
+    parser_s.add_argument('--host', default='')
+    parser_s.add_argument('--port', type=int)
+    parser_s.add_argument('--htpasswd')
+    parser_s.add_argument('--sslkey')
+    parser_s.add_argument('--sslcert')
+
+    parser_s.add_argument('--ctlpath', default='/ctl')
+    parser_s.add_argument('--ctlhost', default='')
+    parser_s.add_argument('--ctlport', type=int)
+    parser_s.add_argument('--ctlhtpasswd')
+    parser_s.add_argument('--ctlsslkey')
+    parser_s.add_argument('--ctlsslcert')
+
+    # -- ctl command parser
+    parser_c = subcommand.add_parser('ctl')
+    parser_c.add_argument('--ctlurl', default='http://localhost/ctl')
+    parser_c.add_argument('--ctluser')
+    parser_c.add_argument('--ctlpasswd')
+
+    control_method = parser_c.add_subparsers(dest='control_method')
+
+    parser_c_ap = control_method.add_parser('addport')
+    parser_c_ap.add_argument('target')
+    parser_c_ap.add_argument('--insecure', action='store_true', default=False)
+    parser_c_ap.add_argument('--cacerts')
+    parser_c_ap.add_argument('--user')
+    parser_c_ap.add_argument('--passwd')
+
+    parser_c_sp = control_method.add_parser('shutport')
+    parser_c_sp.add_argument('port', type=int)
+    parser_c_sp.add_argument('--no', action='store_false', default=True)
+
+    parser_c_dp = control_method.add_parser('delport')
+    parser_c_dp.add_argument('port', type=int)
+
+    parser_c_lp = control_method.add_parser('listport')
+
+    # -- go
     args = parser.parse_args()
-
     globals()['start_' + args.subcommand](args)