Changeset 211

Timestamp:

08/04/12 17:07:18 (12 years ago)

Author:

atzm

Message:

• shutport -> setport

File:

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

etherws/trunk/etherws.py

@@ -597 +597 @@
         return {'entries': [self._portstat(self._switch.get_port(portnum))]}
 
+    def handle_setPort(self, params):
+        port = self._switch.get_port(int(params['port']))
+        shut = params.get('shut')
+        if shut is not None:
+            port.shut = bool(shut)
+        return {'entries': [self._portstat(port)]}
+
     def handle_delPort(self, params):
         port = self._switch.get_port(int(params['port']))
         port.interface.close()
-        return {'entries': [self._portstat(port)]}
-
-    def handle_shutPort(self, params):
-        port = self._switch.get_port(int(params['port']))
-        port.shut = bool(params['shut'])
         return {'entries': [self._portstat(port)]}
 
@@ -837 +839 @@
             print_portlist(result['result']['entries'])
 
-    def handle_ctl_shutport(args):
+    def handle_ctl_setport(args):
         if args.port <= 0:
             raise ValueError('Invalid port: %d' % args.port)
-        result = request(args, 'shutPort', {
-            'port': args.port,
-            'shut': args.no,
-        })
+        req = {'port': args.port}
+        shut = getattr(args, 'shut', None)
+        if shut is not None:
+            req['shut'] = bool(shut)
+        result = request(args, 'setPort', req)
         if 'error' in result:
             _print_error(result['error'])
@@ -932 +935 @@
         '--insecure', action='store_true', default=False)
 
-    # -- ctl shutport
-    parser_ctl_shutport = control_method.add_parser('shutport')
-    parser_ctl_shutport.add_argument('port', type=int)
-    parser_ctl_shutport.add_argument(
-        '--no', action='store_false', default=True)
+    # -- ctl setport
+    parser_ctl_setport = control_method.add_parser('setport')
+    parser_ctl_setport.add_argument('port', type=int)
+    parser_ctl_setport.add_argument('--shut', type=int, choices=(0, 1))
 
     # -- ctl delport