libs.tools.resolve_identifier: add support for named networks

2021-12-14 13:24:26 +01:00 · 2021-12-14 13:24:26 +01:00 · 1742f51778
commit 1742f51778
parent 969b45d9f7
3 changed files with 707 additions and 8 deletions
--- a/libs/tools.py
+++ b/libs/tools.py
@ -22,14 +22,13 @@ def resolve_identifier(repo, identifier):
                    return {'ipv4': {ip}, 'ipv6': set()}
                else:
                    return {'ipv4': set(), 'ipv6': {ip}}
-            except Exception as e:
-                io.stderr('{x}  {t} Exception while resolving "{i}": {e}'.format(
-                    x=red('✘'),
-                    t=bold('libs.tools.resolve_identifier'),
-                    i=identifier,
-                    e=str(e),
-                ))
-                raise
+            except ValueError:
+                try:
+                    return repo.libs.firewall.named_networks[identifier]
+                except KeyError:
+                    raise BundleError(
+                        f'libs.tools.resolve_identifier(): Could not resolve {identifier}'
+                    )

    found_ips = set()
    for node in nodes: