Changeset 212

Timestamp:

08/15/12 02:29:38 (12 years ago)

Author:

atzm

Message:

• add interface attribute management (addr, netmask, mtu)

File:

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

etherws/trunk/etherws.py

@@ -45 +45 @@
 import fcntl
 import base64
+import socket
 import urllib2
 import hashlib
@@ -391 +392 @@
     def closed(self):
         return not self._tap
+
+    @property
+    def address(self):
+        if self.closed:
+            raise ValueError('I/O operation on closed tap')
+        try:
+            return self._tap.addr
+        except:
+            return ''
+
+    @property
+    def netmask(self):
+        if self.closed:
+            raise ValueError('I/O operation on closed tap')
+        try:
+            return self._tap.netmask
+        except:
+            return ''
+
+    @property
+    def mtu(self):
+        if self.closed:
+            raise ValueError('I/O operation on closed tap')
+        return self._tap.mtu
+
+    @address.setter
+    def address(self, address):
+        if self.closed:
+            raise ValueError('I/O operation on closed tap')
+        self._tap.addr = address
+
+    @netmask.setter
+    def netmask(self, netmask):
+        if self.closed:
+            raise ValueError('I/O operation on closed tap')
+        self._tap.netmask = netmask
+
+    @mtu.setter
+    def mtu(self, mtu):
+        if self.closed:
+            raise ValueError('I/O operation on closed tap')
+        self._tap.mtu = mtu
 
     def open(self):
@@ -609 +652 @@
         return {'entries': [self._portstat(port)]}
 
+    def handle_setInterface(self, params):
+        portnum = int(params['port'])
+        port = self._switch.get_port(portnum)
+        address = params.get('address')
+        netmask = params.get('netmask')
+        mtu = params.get('mtu')
+        if not isinstance(port.interface, TapHandler):
+            raise ValueError('Port %d has unsupported interface: %s' %
+                             (portnum, port.interface.IFTYPE))
+        if address is not None:
+            port.interface.address = address
+        if netmask is not None:
+            port.interface.netmask = netmask
+        if mtu is not None:
+            port.interface.mtu = mtu
+        return {'entries': [self._ifstat(port)]}
+
+    def handle_listInterface(self, params):
+        return {'entries': [self._ifstat(p) for p in self._switch.portlist
+                            if isinstance(p.interface, TapHandler)]}
+
     def _optparse_tap(self, opt):
         return {'debug': self._debug}
@@ -637 +701 @@
             'rx':     port.rx,
             'shut':   port.shut,
+        }
+
+    @staticmethod
+    def _ifstat(port):
+        return {
+            'port':    port.number,
+            'type':    port.interface.IFTYPE,
+            'target':  port.interface.target,
+            'address': port.interface.address,
+            'netmask': port.interface.netmask,
+            'mtu':     port.interface.mtu,
         }
 
@@ -813 +888 @@
             print(fmt %
                   (r['port'], r['type'], shut, r['rx'], r['tx'], r['target']))
+
+    def print_iflist(result):
+        pmax = maxlen(result, 'port', 4)
+        tmax = maxlen(result, 'type', 4)
+        amax = maxlen(result, 'address', 7)
+        nmax = maxlen(result, 'netmask', 7)
+        mmax = maxlen(result, 'mtu', 3)
+        fmt = '  %%%ds  %%%ds  %%%ds  %%%ds  %%%ds  %%s' % \
+              (pmax, tmax, amax, nmax, mmax)
+        print(fmt % ('Port', 'Type', 'Address', 'Netmask', 'MTU', 'Target'))
+        for r in result:
+            print(fmt % (r['port'], r['type'],
+                         r['address'], r['netmask'], r['mtu'], r['target']))
 
     def handle_ctl_addport(args):
@@ -868 +956 @@
             print_portlist(result['result']['entries'])
 
+    def handle_ctl_setif(args):
+        if args.port <= 0:
+            raise ValueError('Invalid port: %d' % args.port)
+        req = {'port': args.port}
+        address = getattr(args, 'address', None)
+        netmask = getattr(args, 'netmask', None)
+        mtu = getattr(args, 'mtu', None)
+        if address is not None:
+            if address:
+                socket.inet_aton(address)  # validate
+            req['address'] = address
+        if netmask is not None:
+            if netmask:
+                socket.inet_aton(netmask)  # validate
+            req['netmask'] = netmask
+        if mtu is not None:
+            if mtu < 576:
+                raise ValueError('Invalid MTU: %d' % mtu)
+            req['mtu'] = mtu
+        result = request(args, 'setInterface', req)
+        if 'error' in result:
+            _print_error(result['error'])
+        else:
+            print_iflist(result['result']['entries'])
+
+    def handle_ctl_listif(args):
+        result = request(args, 'listInterface')
+        if 'error' in result:
+            _print_error(result['error'])
+        else:
+            print_iflist(result['result']['entries'])
+
     def handle_ctl_listfdb(args):
         result = request(args, 'listFdb')
@@ -947 +1067 @@
     parser_ctl_listport = control_method.add_parser('listport')
 
+    # -- ctl setif
+    parser_ctl_setif = control_method.add_parser('setif')
+    parser_ctl_setif.add_argument('port', type=int)
+    parser_ctl_setif.add_argument('--address')
+    parser_ctl_setif.add_argument('--netmask')
+    parser_ctl_setif.add_argument('--mtu', type=int)
+
+    # -- ctl listif
+    parser_ctl_listif = control_method.add_parser('listif')
+
     # -- ctl listfdb
     parser_ctl_listfdb = control_method.add_parser('listfdb')