Changeset 191

Timestamp:

07/30/12 23:48:21 (12 years ago)

Author:

atzm

Message:

• implement ctl command "addport"

File:

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

etherws/trunk/etherws.py

@@ -320 +320 @@
 
 class EtherWebSocketHandler(DebugMixIn, BasicAuthMixIn, WebSocketHandler):
+    IFTYPE = 'server'
+
     def __init__(self, app, req, switch, htpasswd=None, debug=False):
         super(EtherWebSocketHandler, self).__init__(app, req)
@@ -326 +328 @@
         self._debug = debug
 
-    @classmethod
-    def get_type(cls):
-        return 'server'
-
     def get_target(self):
         return self.request.remote_ip
@@ -348 +346 @@
 
 class TapHandler(DebugMixIn):
+    IFTYPE = 'tap'
     READ_SIZE = 65535
 
@@ -356 +355 @@
         self._debug = debug
         self._tap = None
-
-    @classmethod
-    def get_type(cls):
-        return 'tap'
 
     def get_target(self):
@@ -416 +411 @@
 
 class EtherWebSocketClient(DebugMixIn):
+    IFTYPE = 'client'
+
     def __init__(self, ioloop, switch, url, ssl_=None, cred=None, debug=False):
         self._ioloop = ioloop
@@ -429 +426 @@
             auth = ['Authorization: Basic %s' % token]
             self._options['header'] = auth
-
-    @classmethod
-    def get_type(cls):
-        return 'client'
 
     def get_target(self):
@@ -495 +488 @@
 class EtherWebSocketControlHandler(DebugMixIn, BasicAuthMixIn, RequestHandler):
     NAMESPACE = 'etherws.control'
-    INTERFACES = {
-        TapHandler.get_type():           TapHandler,
-        EtherWebSocketClient.get_type(): EtherWebSocketClient,
+    IFTYPES = {
+        TapHandler.IFTYPE:           TapHandler,
+        EtherWebSocketClient.IFTYPE: EtherWebSocketClient,
     }
 
@@ -540 +533 @@
             target = p['target']
             options = getattr(self, '_optparse_' + type_)(p.get('options', {}))
-            klass = self.INTERFACES[type_]
+            klass = self.IFTYPES[type_]
             interface = klass(self._ioloop, self._switch, target, **options)
             portnum = interface.open()
@@ -577 +570 @@
         return {
             'port':   port.number,
-            'type':   port.interface.get_type(),
+            'type':   port.interface.IFTYPE,
             'target': port.interface.get_target(),
             'tx':     port.tx,
@@ -735 +728 @@
 
     def handle_ctl_addport(args):
-        raise NotImplementedError('addport')
+        params = [{
+            'type':    args.type,
+            'target':  args.target,
+            'options': {
+                'instance': args.insecure,
+                'cacerts':  args.cacerts,
+                'user':     args.user,
+                'passwd':   args.passwd,
+            }
+        }]
+        res = request(args, 'addPort', params)
+        print(yaml.safe_dump(res))
 
     def handle_ctl_shutport(args):
@@ -790 +794 @@
 
     parser_c_ap = control_method.add_parser('addport')
+    parser_c_ap.add_argument(
+        'type', choices=EtherWebSocketControlHandler.IFTYPES.keys())
     parser_c_ap.add_argument('target')
     parser_c_ap.add_argument('--insecure', action='store_true', default=False)