From 9c5438da65bba198bba2a2a127f3f6448dcb56c5 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sun, 03 May 2026 14:12:59 +0000
Subject: [PATCH] NetworkDriver: fix return type annotation in create_interface
---
lib/NetworkDriver.py | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/lib/NetworkDriver.py b/lib/NetworkDriver.py
index 6fa4a0d..306172d 100644
--- a/lib/NetworkDriver.py
+++ b/lib/NetworkDriver.py
@@ -15,7 +15,7 @@
return ''.join([random.choice(chars) for _ in range(size)])
-def create_interface(endpoint, network) -> str:
+def create_interface(endpoint, network) -> tuple[str, str]:
ifname0 = 'veth{}'.format(genid())
ifname1 = 'veth{}'.format(genid())
@@ -37,10 +37,19 @@
ip.link('set', index=idx, state='up')
if 'parent' in network.Options:
id_parent = ip.link_lookup(ifname=network.Options['parent'])[0]
- print(ip.link("set", index=idx, master=id_parent))
+ ip.link("set", index=idx, master=id_parent)
endpoint.Interface.Peer = ifname1
- return ifname0
+ return ifname0, ifname1
+
+
+def delete_interface(interface):
+ try:
+ with pyroute2.IPRoute() as ip:
+ idx = ip.link_lookup(ifname=interface)[0]
+ ip.link("delete", index=idx)
+ except:
+ pass
@app.route('/NetworkDriver.GetCapabilities', methods=['POST'])
@@ -48,6 +57,21 @@
return {
'Scope': 'local',
'ConnectivityScope': 'global',
+ 'GwAllocChecker': True,
+ }
+
+
+@app.route('/NetworkDriver.GwAllocCheck', methods=['POST'])
+def GwAllocCheck():
+ request = GwAllocCheckEntity(**flask.request.get_json(force=True))
+ skip_ipv4 = skip_ipv6 = request.Options.get('com.docker.network.generic', {}).get('nogw') == '1'
+ if request.Options.get('com.docker.network.generic', {}).get('nogw4') == '1':
+ skip_ipv4 = True
+ if request.Options.get('com.docker.network.generic', {}).get('nogw6') == '1':
+ skip_ipv6 = True
+ return {
+ 'SkipIPv4': skip_ipv4,
+ 'SkipIPv6': skip_ipv6,
}
@@ -108,7 +132,10 @@
network = networks[join.NetworkID]
endpoint = endpoints['{}-{}'.format(join.NetworkID, join.EndpointID)]
- interface = create_interface(endpoint, network)
+ interface, interface_external = create_interface(endpoint, network)
+
+ endpoint.internal_interface_name = interface
+ endpoint.external_interface_name = interface_external
gw4 = None
for net4 in network.IPv4:
@@ -130,17 +157,35 @@
'SrcName': interface,
'DstPrefix': 'eth',
},
+ 'StaticRoutes': [],
}
if gw4 is not None:
result['Gateway'] = gw4.ip.compressed
if gw6 is not None:
result['GatewayIPv6'] = gw6.ip.compressed
+ gw4 = endpoint.Options.get("gw4", network.Options.get("gw4", None))
+ if gw4 is not None:
+ result['StaticRoutes'].append({
+ 'Destination': gw4 + '/32',
+ 'RouteType': 1,
+ })
+ result['Gateway'] = gw4
+ gw6 = endpoint.Options.get("gw6", network.Options.get("gw6", None))
+ if gw6 is not None:
+ result['StaticRoutes'].append({
+ 'Destination': gw6 + '/128',
+ 'RouteType': 1,
+ })
+ result['GatewayIPv6'] = gw6
return result
@app.route('/NetworkDriver.Leave', methods=['POST'])
def Leave():
leave = LeaveEntity(**flask.request.get_json(force=True))
+ endpoint = endpoints.get('{}-{}'.format(leave.NetworkID, leave.EndpointID), None)
+ if endpoint is not None and endpoint.external_interface_name:
+ delete_interface(endpoint.external_interface_name)
return {}
--
Gitblit v1.10.0