Initial endpoint creation / deletion implementations

config.json

@@ -23,7 +23,7 @@
     ],
     "linux": {
         "capabilities": [
-            "CAP_SYS_ADMIN"
+            "CAP_NET_ADMIN"
         ]
     },
     "env": [

net-dhcp/__init__.py

@@ -2,6 +2,11 @@ import logging
 
 from flask import Flask, jsonify
 
+class NetDhcpError(Exception):
+    def __init__(self, status, *args):
+        Exception.__init__(self, *args)
+        self.status = status
+
 app = Flask(__name__)
 
 from . import network
@@ -15,4 +20,4 @@ def err_not_found(e):
 @app.errorhandler(Exception)
 def err(e):
     logger.exception(e)
-    return jsonify({'Err': f'Error: {e}'}), 500
+    return jsonify({'Err': str(e)}), 500

net-dhcp/network.py

@@ -8,7 +8,7 @@ import pyroute2
 import docker
 from flask import request, jsonify
 
-from . import app
+from . import NetDhcpError, app
 
 OPTS_KEY = 'com.docker.network.generic' 
 BRIDGE_OPT = 'devplayer0.net-dhcp.bridge'
@@ -25,10 +25,13 @@ client = docker.from_env()
 def close_docker():
     client.close()
 
+def veth_pair(e):
+    return f'dh-{e[:12]}', f'{e[:12]}-dh'
+
 def iface_addrs(iface):
-    return list(map(ipaddress.ip_interface, iface.ipaddr.ipv4))
+    return list(map(ipaddress.ip_interface, iface.ipaddr))
 def iface_nets(iface):
-    return list(map(lambda n: n.network, map(ipaddress.ip_interface, iface.ipaddr.ipv4)))
+    return list(map(lambda n: n.network, map(ipaddress.ip_interface, iface.ipaddr)))
 
 def get_bridges():
     reserved_nets = set(map(ipaddress.ip_network, map(lambda c: c['Subnet'], \
@@ -39,6 +42,9 @@ def get_bridges():
         set(iface_nets(i)).intersection(reserved_nets), map(lambda i: ipdb.interfaces[i], \
             filter(lambda k: isinstance(k, str), ipdb.interfaces.keys())))))
 
+def net_bridge(n):
+    return ipdb.interfaces[client.networks.get(n).attrs['Options'][BRIDGE_OPT]]
+
 @app.route('/NetworkDriver.GetCapabilities', methods=['POST'])
 def net_get_capabilities():
     return jsonify({
@@ -66,3 +72,103 @@ def create_net():
 @app.route('/NetworkDriver.DeleteNetwork', methods=['POST'])
 def delete_net():
     return jsonify({})
+
+@app.route('/NetworkDriver.CreateEndpoint', methods=['POST'])
+def create_endpoint():
+    req = request.get_json(force=True)
+    req_iface = req['Interface']
+
+    bridge = net_bridge(req['NetworkID'])
+    bridge_nets = iface_nets(bridge)
+
+    if_host, if_container = veth_pair(req['EndpointID'])
+    logger.info(f'creating veth pair {if_host} <=> {if_container}')
+    if_host = (ipdb.create(ifname=if_host, kind='veth', peer=if_container)
+                .up()
+                .commit())
+
+    if_container = (ipdb.interfaces[if_container]
+                    .up()
+                    .commit())
+    res_iface = {
+        'MacAddress': '',
+        'Address': '',
+        'AddressIPv6': ''
+    }
+
+    try:
+        if 'MacAddress' in req_iface and req_iface['MacAddress']:
+            if_container.address = req_iface['MacAddress']
+            if_container.commit()
+        else:
+            res_iface['MacAddress'] = if_container.address
+
+        def try_addr(type_):
+            k = 'AddressIPv6' if type_ == 'v6' else 'Address'
+            if k in req_iface and req_iface[k]:
+                a = ipaddress.ip_address(req_iface[k])
+                net = next(filter(lambda n: a in n, bridge_nets), None)
+                if not net:
+                    raise NetDhcpError(400, f'No suitable network found for {type_} address {a} on bridge {bridge.ifname}')
+
+                to_add = f'{a}/{net.prefixlen}'
+                logger.info(f'Adding address {a}/{net.prefixlen} to {if_container}')
+                (if_container
+                    .add_ip(to_add)
+                    .commit())
+            else:
+                raise NetDhcpError(400, f'DHCP{type_} is currently unsupported')
+        try_addr('v4')
+        try_addr('v6')
+
+        (bridge
+            .add_port(if_host)
+            .commit())
+
+        res = jsonify({
+            'Interface': res_iface
+        })
+    except NetDhcpError as e:
+        (if_host
+            .remove()
+            .commit())
+        logger.error(e)
+        res = jsonify({'Err': str(e)}), e.status
+    except Exception as e:
+        (if_host
+            .remove()
+            .commit())
+        res = jsonify({'Err': str(e)}), 500
+    finally:
+        return res
+
+@app.route('/NetworkDriver.EndpointOperInfo', methods=['POST'])
+def endpoint_info():
+    req = request.get_json(force=True)
+
+    bridge = net_bridge(req['NetworkID'])
+    if_host, _if_container = veth_pair(req['EndpointID'])
+    if_host = ipdb.interfaces[if_host]
+
+    return jsonify({
+        'bridge': bridge,
+        'if_host': {
+            'name': if_host.ifname,
+            'mac': if_host.address
+        }
+    })
+
+@app.route('/NetworkDriver.DeleteEndpoint', methods=['POST'])
+def delete_endpoint():
+    req = request.get_json(force=True)
+
+    bridge = net_bridge(req['NetworkID'])
+    if_host, _if_container = veth_pair(req['EndpointID'])
+    if_host = ipdb.interfaces[if_host]
+
+    bridge.del_port(if_host.ifname)
+    (if_host
+        .remove()
+        .commit())
+
+    return jsonify({})