extern/podman-compose
1
0
Fork 1
mirror of https://github.com/containers/podman-compose.git synced 2024-10-05 09:31:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

add support for network priorities

Browse Source 
Signed-off-by: Benedikt Braunger <bb@emlix.com>
This commit is contained in:
Benedikt Braunger 2023-02-09 20:43:25 +01:00 committed by Muayyad Alsadi
parent ed2a6c0917
commit ef55067834
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
podman_compose.py
View File

@ -792,17 +792,28 @@ def get_net_args(compose, cnt):
ip = None ip = None
ip6 = None ip6 = None
if cnt_nets and is_dict(cnt_nets): if cnt_nets and is_dict(cnt_nets):
cnt_nets_prioritized = dict()
# cnt_nets is {net_key: net_value, ...} # cnt_nets is {net_key: net_value, ...}
for net_value in cnt_nets.values(): for net_key, net_value in cnt_nets.items():
net_value = net_value or {} net_value = net_value or {}
aliases.extend(norm_as_list(net_value.get("aliases", None))) aliases.extend(norm_as_list(net_value.get("aliases", None)))
if not ip: if not ip:
ip = net_value.get("ipv4_address", None) ip = net_value.get("ipv4_address", None)
if not ip6: if not ip6:
ip6 = net_value.get("ipv6_address", None) ip6 = net_value.get("ipv6_address", None)
cnt_nets = list(cnt_nets.keys()) net_priority = net_value.get("priority", 0)
if not net_priority in cnt_nets_prioritized:
cnt_nets_prioritized[net_priority] = list()
cnt_nets_prioritized[net_priority].append(net_key)
# sort each priority list alphabetically
for prio in cnt_nets_prioritized:
cnt_nets_prioritized[prio].sort()
# sort dict by priority
cnt_nets_prioritized = dict(sorted(cnt_nets_prioritized.items(), reverse=True))
# flatten the priority dict to a list
cnt_nets = [name for prios in cnt_nets_prioritized.values() for name in prios]
cnt_nets = norm_as_list(cnt_nets or default_net) cnt_nets = norm_as_list(cnt_nets or default_net)
net_names = set() net_names = list()
for net in cnt_nets: for net in cnt_nets:
net_desc = nets[net] or {} net_desc = nets[net] or {}
is_ext = net_desc.get("external", None) is_ext = net_desc.get("external", None)
@ -811,7 +822,7 @@ def get_net_args(compose, cnt):
net_name = ( net_name = (
ext_desc.get("name", None) or net_desc.get("name", None) or default_net_name ext_desc.get("name", None) or net_desc.get("name", None) or default_net_name
) )
net_names.add(net_name) net_names.append(net_name)
net_names_str = ",".join(net_names) net_names_str = ",".join(net_names)
if is_bridge: if is_bridge:
net_args.extend(["--net", net_names_str, "--network-alias", ",".join(aliases)]) net_args.extend(["--net", net_names_str, "--network-alias", ",".join(aliases)])