operations/docker.network: add support for aux addresses

Author: DonDebonair

pyinfra/operations/docker.py

@@ -227,6 +227,7 @@ def network(
     ipam_driver="",
     subnet="",
     scope="",
+    aux_addresses=None,
     opts=None,
     ipam_opts=None,
     labels=None,
@@ -279,6 +280,7 @@ def network(
             ipam_driver=ipam_driver,
             subnet=subnet,
             scope=scope,
+            aux_addresses=aux_addresses,
             opts=opts,
             ipam_opts=ipam_opts,
             labels=labels,

pyinfra/operations/util/docker.py

@@ -117,6 +117,7 @@ def _remove_volume(**kwargs):
 
 def _create_network(**kwargs):
     command = []
+    aux_addresses = kwargs["aux_addresses"] if kwargs["aux_addresses"] else {}
     opts = kwargs["opts"] if kwargs["opts"] else []
     ipam_opts = kwargs["ipam_opts"] if kwargs["ipam_opts"] else []
     labels = kwargs["labels"] if kwargs["labels"] else []
@@ -146,6 +147,9 @@ def _create_network(**kwargs):
     if kwargs["attachable"]:
         command.append("--attachable")
 
+    for host, address in aux_addresses.items():
+        command.append("--aux-address '{0}={1}'".format(host, address))
+
     for opt in opts:
         command.append("--opt {0}".format(opt))
 

tests/operations/docker.network/add_network_macvlan_with_aux_addresses.json

@@ -0,0 +1,21 @@
+{
+    "kwargs": {
+        "network": "nginx",
+        "driver": "macvlan",
+        "gateway": "192.168.1.1",
+        "ip_range": "192.168.1.192/27",
+        "subnet": "192.168.1.1/24",
+        "aux_addresses": {
+            "host": "192.168.1.223"
+        },
+        "present": true
+    },
+    "facts": {
+        "docker.DockerNetwork": {
+            "object_id=nginx": []
+        }
+    },
+    "commands": [
+        "docker network create nginx -d macvlan --gateway 192.168.1.1 --ip-range 192.168.1.192/27 --subnet 192.168.1.1/24 --aux-address 'host=192.168.1.223'"
+    ]
+}